diff --git a/Server/api/views.py b/Server/api/views.py
index 81c3826..874b1f5 100644
--- a/Server/api/views.py
+++ b/Server/api/views.py
@@ -4,9 +4,12 @@ from rest_framework.response import Response
 from rest_framework.decorators import api_view
 from api.models import *
 
+# ----------------------------------------------------------------------------------------------- #
 @api_view(['POST'])
 def client(request):
-    if not Client.objects.get(hostname=request.data['hostname']):
+    try:
+        Client.objects.get(hostname=request.data['hostname'])
+    except Client.DoesNotExist:
         temp = Client(
             hostname=request.data['hostname']
         )
@@ -14,6 +17,7 @@ def client(request):
         return Response(status=status.HTTP_201_CREATED)
     return Response(status=status.HTTP_200_OK)
 
+# ----------------------------------------------------------------------------------------------- #
 @api_view(['POST'])
 def temperature(request):
     client = Client.objects.get(hostname=request.data['hostname'])
@@ -25,7 +29,7 @@ def temperature(request):
     temp.save()
     return Response(status=status.HTTP_201_CREATED)
 
-
+# ----------------------------------------------------------------------------------------------- #
 @api_view(['POST'])
 def moisture(request):
     client = Client.objects.get(hostname=request.data['hostname'])
@@ -33,9 +37,10 @@ def moisture(request):
         moisture=request.data['moistrue'],
         created_by=client
     )
+    temp.save()
     return Response(status=status.HTTP_201_CREATED)
 
-
+# ----------------------------------------------------------------------------------------------- #
 @api_view(['POST'])
 def waterlevel(request):
     client = Client.objects.get(hostname=request.data['hostname'])
@@ -43,4 +48,5 @@ def waterlevel(request):
         waterlevel=request.data['waterlevel'],
         created_by=client
     )
-    return Response(status=status.HTTP_201_CREATED)
\ No newline at end of file
+    temp.save()
+    return Response(status=status.HTTP_201_CREATED)