diff --git a/data_structures/6_Queue/Exercise/food_ordering_system.py b/data_structures/6_Queue/Exercise/food_ordering_system.py
index 3658a41..59285cd 100644
--- a/data_structures/6_Queue/Exercise/food_ordering_system.py
+++ b/data_structures/6_Queue/Exercise/food_ordering_system.py
@@ -11,9 +11,9 @@ def enqueue(self, val):
         self.buffer.appendleft(val)
 
     def dequeue(self):
-        if len(self.buffer)==0:
-            print("Queue is empty")
-            return
+        # if len(self.buffer)==0:
+        #     print("Queue is empty")
+        #     return
 
         return self.buffer.pop()
 
@@ -34,15 +34,19 @@ def place_orders(orders):
 
 def serve_orders():
     time.sleep(1)
-    while True:
+    while food_order_queue.size() > 0:
         order = food_order_queue.dequeue()
         print("Now serving: ",order)
         time.sleep(2)
 
+        if food_order_queue.size() == 0:
+            print("Queue is empty")
+            return
+
 if __name__ == '__main__':
     orders = ['pizza','samosa','pasta','biryani','burger']
     t1 = threading.Thread(target=place_orders, args=(orders,))
     t2 = threading.Thread(target=serve_orders)
 
     t1.start()
-    t2.start()
\ No newline at end of file
+    t2.start()