diff --git a/Tetris.py b/Tetris.py
index 77fb109..28f0b19 100644
--- a/Tetris.py
+++ b/Tetris.py
@@ -53,7 +53,7 @@ class Tetris:
         if self.current_piece:
             self.current_piece.update(elapsed_time, self)
         else:
-            self.__generate_piece((300, 100))
+            self.current_piece = PieceGenerator.get_piece((360, 100)) # TODO calculate spawn position
 
         if self.stack:
             self.stack.update(elapsed_time)
@@ -99,17 +99,13 @@ class Tetris:
         self.screen.fill(bg_color)
 
         # draw all game objects
-        if self.current_piece:
-            self.current_piece.draw(self.screen)
         if self.well:
             self.well.draw(self.screen)
         if self.stack:
             self.stack.draw(self.screen)
+        if self.current_piece:
+            self.current_piece.draw(self.screen)
 
         # update display
         pygame.display.update()
-
-    # TODO one line method is questionable
-    def __generate_piece(self, position):
-        self.current_piece = PieceGenerator.get_piece(position)
     
\ No newline at end of file