diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java
index 91ab975..a0beb6a 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java
@@ -38,8 +38,8 @@
         this.pageMap.put(0, 0);
     }
 
-    private Gallery gallery = Gallery.getInstance();
-    private Accounts accounts = Accounts.getInstance();
+    //private Gallery gallery = Gallery.getInstance();
+    //private Accounts accounts = Accounts.getInstance();
 
     //-----------------------------------------------------------------
     // setter
@@ -98,12 +98,12 @@
 
     //-----------------------------------------------------------------
     // 本当に招待されているかを確認する
-    public Collection<Account> searchAnimationInvites(Integer aid, String invitedUid) {
-        Animation anime_info = gallery.getAnimationInformation(aid);
-        Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
-        ArrayList<Account> inviters = null;
+    public Collection<Account> searchAnimationInvites(Account invitedAccount) {
+        //Animation anime_info = gallery.getAnimationInformation(aid);
+        //Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
+        ArrayList<Account> inviters = new ArrayList<>();
 
-        for(Account account : anime_info.invites) {
+        for(Account account : this.invites) {
             if(account == invitedAccount) {
                 inviters.add(account);
             }
@@ -113,43 +113,43 @@
 
     //-----------------------------------------------------------------
     //作品に招待する
-    public void addAccoutToAnimationInvites(Integer aid, String ownerUid, String invitedUid) {
-        Animation animation = gallery.getAnimationByAid(aid);
-        Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
-        invites.add(invitedAccount);
+    public void addAccountToAnimationInvites(Account invitedAccount) {
+        //Animation animation = gallery.getAnimationByAid(aid);
+        //Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
+        this.invites.add(invitedAccount);
     }
 
     //-----------------------------------------------------------------
     //招待されて人が招待を取り消す
-    public void deleteAccountFromAnimationInvites(Integer aid, String invitedUid) {
-        Animation animation = gallery.getAnimationByAid(aid);
-        Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
-        invites.remove(invitedAccount);
+    public void deleteAccountFromAnimationInvites(Account invitedAccount) {
+        //Animation animation = gallery.getAnimationByAid(aid);
+        //Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
+        this.invites.remove(invitedAccount);
     }
 
 
     //-----------------------------------------------------------------
     //gallery/aid/editorsのPUTの中身の処理
-    public void restWorkToEditors(Integer aid, Integer Uid) {
-        Account account = accounts.getAccountByUid(Uid);
-        Animation animation = gallery.getAnimationByAid(aid);
+    public void restWorkToEditors(Account account) {
+        //Account account = accounts.getAccountByUid(Uid);
+        //Animation animation = gallery.getAnimationByAid(aid);
 
         Editor editor = new Editor(account, false);
         editor.setAccount(account);
-        animation.addEditors(editor);
-        animation.removeAnimationInvites(account);
+        this.addEditors(editor);
+        this.removeAnimationInvites(account);
     }
 
 
     //-----------------------------------------------------------------
     //-----------------------------------------------------------------
     // ダミー
-    private void createDummyAnimation() {
+    private void createDummyAnimation(Account ownerAccount) {
         this.isDummy = true;
         this.aid = 1111;
         this.name = "dummyAnimation";
         this.isPublic = false;
-        this.owner = accounts.getAccountByUid(1);
+        this.owner = ownerAccount;
         this.editors.add(new Editor(owner, true));
         this.pageMap.put(0,0);
         this.createdDate = LocalDateTime.now();
diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java
index 31e2fb6..ffd5798 100644
--- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java
+++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java
@@ -49,7 +49,7 @@
         if (ownerToken == null) {
             Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
             if (invitedAccount != null && invitedAccount.getToken().equals(invitedUserToken)) {
-                return animation.searchAnimationInvites(aid, invitedUid);
+                return animation.searchAnimationInvites(invitedAccount);
             } else {
                 throw new WebApplicationException(404);
             }
@@ -75,11 +75,12 @@
     @Produces(MediaType.APPLICATION_JSON)
     public String addInvite(@PathParam("aid") Integer aid, @FormParam("ownerUid") String ownerUid, @FormParam("invitedUid") String invitedUid, @FormParam("ownerToken") String ownerToken) {
         Animation animation = animations.getAnimationByAid(aid);
+        Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
         Account owner = animation.getOwner();
 
         if (owner != null && owner.getToken().equals(ownerToken)) {
-            animation.addAccoutToAnimationInvites(aid, ownerUid, invitedUid);
-            //↓矢印Workのstatusを招待状態にする処理
+            animation.addAccountToAnimationInvites(invitedAccount);
+            //↓Workのstatusを招待状態にする処理
             Account account = accounts.getAccountByUid(Integer.parseInt(invitedUid));
             account.getWorkHashMap().get(aid).setInvites(aid);
             return "追加しました";
@@ -104,11 +105,11 @@
     @Produces(MediaType.APPLICATION_JSON)
     public String deleteInvite(@PathParam("aid") Integer aid, @FormParam("invitedUid") String invitedUid, @FormParam("invitedToken") String invitedToken) {
         Animation animation = animations.getAnimationByAid(aid);
+        Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
 
         //トークンの確認
-        Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid));
         if (invitedAccount != null && invitedAccount.getToken().equals(invitedToken)) {
-            animation.deleteAccountFromAnimationInvites(aid, invitedUid);
+            animation.deleteAccountFromAnimationInvites(invitedAccount);
             return "削除しました";
         } else {
             throw new WebApplicationException(404);