diff --git a/api/optimeet/groups/urls.py b/api/optimeet/groups/urls.py
index 4e26818..ce4c321 100644
--- a/api/optimeet/groups/urls.py
+++ b/api/optimeet/groups/urls.py
@@ -12,6 +12,5 @@
     #path('usergroups/', views.UserGroupListAPIView.as_view(), name='usergroup-list'),#get all usergroup
     #path('usergroups/<str:user_id>/', views.UserGroupListAPIView.as_view(), name='usergroup-byuser'),#get usergroup by user_id
     path("<str:group_id>/recs/", views.get_recommendation),
-    path("<str:group_id>/votes/", views.votes, name='votes'),
-    path("<str:group_id>/votes/", views.create_vote, name='create_vote')
+    path("<str:group_id>/votes/", views.votes, name='votes')
 ]
\ No newline at end of file
diff --git a/api/optimeet/groups/views.py b/api/optimeet/groups/views.py
index 0b59638..b77fe83 100644
--- a/api/optimeet/groups/views.py
+++ b/api/optimeet/groups/views.py
@@ -89,27 +89,25 @@ def add_preference_to_group(request, group_id, user_id, format=None):
     return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 @csrf_exempt
-@api_view(['GET'])  
+@api_view(['GET', 'POST'])  
 def votes(request, group_id):
-    votes = models.Votes.objects.filter(group_id=group_id)
-    serializer = serializers.VotesSerializer(votes, many=True)
-    return Response(serializer.data)
-    
-@csrf_exempt
-@api_view(['POST'])
-def create_vote(request, group_id):
-    try:
-        group = models.Group.objects.get(pk=group_id)
-    except models.Group.DoesNotExist:
-        raise Http404
+    if request.method == 'GET':
+        votes = models.Votes.objects.filter(group_id=group_id)
+        serializer = serializers.VotesSerializer(votes, many=True)
+        return Response(serializer.data)
+    elif request.method == 'POST':
+        try:
+            group = models.Group.objects.get(pk=group_id)
+        except models.Group.DoesNotExist:
+            raise Http404
 
-    serializer = serializers.VotesSerializer(data = request.data, context={'group_id': group})
+        serializer = serializers.VotesSerializer(data = request.data, context={'group_id': group})
 
-    if serializer.is_valid():
-        serializer.save()
-        return Response(status=status.HTTP_201_CREATED)
-    
-    return Response(status=status.HTTP_400_BAD_REQUEST)   
+        if serializer.is_valid():
+            serializer.save()
+            return Response(status=status.HTTP_201_CREATED)
+        
+        return Response(status=status.HTTP_400_BAD_REQUEST)
   
 # #for testing
 # class UserGroupListAPIView(APIView):