diff --git a/src/main/java/com/example/cosmos_serversb/models/Groups.java b/src/main/java/com/example/cosmos_serversb/models/Groups.java
index db5cd0b..aa4e1b6 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Groups.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java
@@ -12,7 +12,6 @@
 public class Groups {
     private static Groups theInstance = null;
     private static ArrayList<Group> groups = new ArrayList<>();
-    //private static HashMap<String, String> groupsMap = new HashMap<>();
 
     private static SessionFactory sessionFactory;
     private static String baseURI = "http://nitta-lab-www.is.konan-u.ac.jp/";
@@ -40,9 +39,11 @@
         String rId = UUID.randomUUID().toString();
         return rId;
     }
-    
+
     public static GroupsMapJson getGroupsListByUid(String uId){
-        return getGroupsHashMap(uId);
+        Session session = SessionManager.getInstance().getSession();
+        GroupsMapJson groupsjson = new GroupsMapJson(session.load(User.class, uId));
+        return groupsjson;
     }
 
     public static Group createGroup(String name, String uId){
@@ -138,11 +139,4 @@
         }
     }
     */
-
-    public static GroupsMapJson getGroupsHashMap(String uId){
-        Session session = SessionManager.getInstance().getSession();
-        GroupsMapJson groupsjson = new GroupsMapJson(session.load(User.class, uId));
-        return groupsjson;
-    }
-
 }
diff --git a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
index 70f42fd..0fc15aa 100644
--- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
+++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
@@ -19,7 +19,7 @@
 public class GroupsRest {
     @GET
     public String getGroupsListByUid(@QueryParam("uId") String uId, @QueryParam("token") String token) throws JsonProcessingException{
-        Session session = SessionManager.getInstance().getSession();
+        SessionManager.getInstance().getSession();
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(Groups.getInstance().getGroupsListByUid(uId));
         SessionManager.getInstance().closeSession();
@@ -54,8 +54,13 @@
     @GET
     public String getGroupByGid(@PathParam("gId") String gId, @QueryParam("token") String token) throws JsonProcessingException{
         SessionManager.getInstance().getSession();
+        Group group = Groups.getInstance().getGroupByGid(gId);
+        SessionManager.getInstance().closeSession();
+
+        Session session = SessionManager.getInstance().getSession();
+        GroupJson groupJson = new GroupJson(session.load(Group.class, group.getgId()));
         ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(Groups.getInstance().getGroupByGid(gId));
+        String json = mapper.writeValueAsString(groupJson);
         SessionManager.getInstance().closeSession();
         return json;
     }