diff --git a/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java b/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java
index 4595917..ca98622 100644
--- a/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java
+++ b/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java
@@ -338,7 +338,8 @@
         return 1;
     }
 
-    public int setTodo(String accountId, int bookId, int year, int month, int day, int todoId, String title){
+    public int setTodo(String accountId, int bookId, int year, int month, int day,
+                       int newBookId, int newYear, int newMonth, int newDay, int todoId, String title){
         if(!todos.containsKey(accountId)){
             return -1;
         }
@@ -357,11 +358,8 @@
         if(!todos.get(accountId).get(bookId).get(year).get(month).get(day).containsKey(todoId)){
             return -1;
         }
-        todos.get(accountId).get(bookId).get(year).get(month).get(day).get(todoId).setTitle(title);
-        todos.get(accountId).get(bookId).get(year).get(month).get(day).get(todoId).setBookId(bookId);
-        todos.get(accountId).get(bookId).get(year).get(month).get(day).get(todoId).setYear(year);
-        todos.get(accountId).get(bookId).get(year).get(month).get(day).get(todoId).setMonth(month);
-        todos.get(accountId).get(bookId).get(year).get(month).get(day).get(todoId).setDay(day);
+        todos.get(accountId).get(bookId).get(year).get(month).get(day).remove(todoId);
+        createTodo(accountId, newBookId, newYear, newMonth, newDay, title);
         return 1;
     }