diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
index 62ae4c9632d6334b0f89f403b249d7a229ab0bb8..68b40b1b3ca1ebf13d1e216e2d1fcf6df3cab5cc 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
@@ -5,6 +5,7 @@ import org.springframework.data.repository.Repository;
 import org.springframework.web.bind.annotation.*;
 import thinkTogether.groupManagement.model.Group;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -20,24 +21,30 @@ public class GroupManagementController implements iGroupService {
        return "Hello from the GroupManagement Controller!";
     }
 
-    @Autowired
-    public GroupManagementController(Repository repository){
-        this.repository = (thinkTogether.groupManagement.repo.iGroupRepository) repository;
-    }
+    //@Autowired
+    //public GroupManagementController(Repository repository){
+    //    this.repository = (thinkTogether.groupManagement.repo.iGroupRepository) repository;
+    //}
 
 
-    @RequestMapping(value="/groups")
+    //@RequestMapping(value="/groups")
     @Override
     public List<Group> findAll() {
-        return repository.findAll();
+        List<Group> actual = repository.findAll();
+
+    //    List<Group> gruppen = new ArrayList<Group>();
+    //    actual.forEach(element -> gruppen.add(element));
+
+        return actual;
     }
 
-    @RequestMapping(value = "/groups/{id}", method = RequestMethod.GET)
+    //@RequestMapping(value = "/groups/{id}", method = RequestMethod.GET)
     @Override
-    public Group findByID(@RequestParam(value = "id")int id) {
+    public Group findByID(@PathVariable("ID") int id) {
         return repository.findByID(id);
     }
 
+
     //@GetMapping("/groups/{id}")
     //public Group getGroupById(@PathVariable(value = "group_ID") long group_ID) {
     //    Group group = repository.findOne(group_ID);
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java
index d75f51096a26d5974d97d786ba7b62fcebb97669..d9cf28d39a320dbb40d5bff2c20bc586f679e0ba 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java
@@ -9,6 +9,5 @@ import java.util.List;
 public interface iGroupService {
 
     public List<Group> findAll();
-
     public Group findByID(int id);
 }
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java
index e9083ea75dc629efecd733cfaa73fe23d49f19ca..26504aa31822c0e33e1e18dd08643d4939dc212b 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java
@@ -12,7 +12,7 @@ import java.util.List;
 @Service
 public interface iGroupRepository extends Repository<Group, Integer> {
     public List<Group> findAll();
-    public Group findByID(int iD);
+    public Group findByID(int ID);
 
 
 }