diff --git a/robotgame/level1.py b/robotgame/level1.py
index d9e774e..2d105f0 100644
--- a/robotgame/level1.py
+++ b/robotgame/level1.py
@@ -74,66 +74,57 @@ class Level1(level.Level):
                                                  i * 48))
 
         ### Task 1: Wheels of fortune
-        task1_pos = (64 * 10, 48 * 10)
+        task1_pos = (64 * 15, 48 * 13)
 
         ws = []
 
         for i in range(5):
-            w1 = Wheel(self, task1_pos[0] - 64, task1_pos[1] + 48 * i * 2)
-            w2 = Wheel(self, task1_pos[0], task1_pos[1] + 48 * i * 2,
+            w1 = Wheel(self, task1_pos[0] + 64 * i, task1_pos[1] - 48 * 2)
+            w2 = Wheel(self, task1_pos[0] + 64 * i, task1_pos[1],
                        immitate=w1)
             self.objects.extend([w1, w2])
             self.objects.append(lever.Lever(self,
-                                            task1_pos[0] + 64 * 1,
-                                            task1_pos[1] + 48 * i * 2,
-                                            [w2.activate]))
-            if i > 0:
-                self.objects.append(lever.Lever(self,
-                                                task1_pos[0],
-                                                task1_pos[1] + 48 * (i * 2 - 1),
-                                                [w2.set_direction],
-                                                toggling=True))
-            else:
-                self.objects.append(lever.Lever(self,
-                                                task1_pos[0] + 64 * 2,
-                                                task1_pos[1] - 48,
-                                                [w2.set_direction],
-                                                toggling=True,
-                                                anim='lever_updown'))
-
+                                            task1_pos[0] + 64 * i,
+                                            task1_pos[1] + 48 * 1,
+                                            [w2.activate],
+                                            anim='lever_updown'))
             ws.append(w2)
+            self.add_tile(task1_pos[0] + 64 * i,
+                          task1_pos[1] - 48 * 3,
+                          'moat_horizontal')
 
         self.objects.append(
             lever.Lever(self,
-                        task1_pos[0] + 64 * 2,
-                        task1_pos[1] + 48 * 9,
+                        task1_pos[0] + 64 * 5,
+                        task1_pos[1] + 48 * 2,
                         [lambda *xs: self.complete_task(1)
                          if len(ws) == len([w for w in ws if w.on])
-                         else lambda: None],
-                        anim='lever_updown'))
+                         else lambda: None]))
 
-        for i in range(9):
-            self.add_tile(task1_pos[0] - 64 * 2,
-                          task1_pos[1] + 48 * i,
-                          'moat_vertical')
-        self.add_tile(task1_pos[0] - 64 * 2,
-                      task1_pos[1] - 48,
+        self.add_tile(task1_pos[0] - 64,
+                      task1_pos[1] - 48 * 3,
                       'moat_corner_north')
-        self.add_tile(task1_pos[0] - 64 * 2,
-                      task1_pos[1] + 48 * 9,
+        self.add_tile(task1_pos[0] + 64 * 5,
+                      task1_pos[1] - 48 * 3,
+                      'moat_corner_north_flip')
+        for i in range(3):
+            self.add_tile(task1_pos[0] - 64,
+                          task1_pos[1] + 48 * (i - 2),
+                          'moat_vertical')
+            self.add_tile(task1_pos[0] + 64 * 5,
+                          task1_pos[1] + 48 * (i - 2),
+                          'moat_vertical')
+        self.add_tile(task1_pos[0] - 64,
+                      task1_pos[1] + 48,
+                      'moat_corner_south_flip')
+        self.add_tile(task1_pos[0] + 64 * 5,
+                      task1_pos[1] + 48,
                       'moat_corner_south')
-        for i in range(2):
-            self.add_tile(task1_pos[0] + 64 * (i - 1),
-                          task1_pos[1] - 48,
-                          'moat_horizontal')
-            self.add_tile(task1_pos[0] + 64 * (i - 1),
-                          task1_pos[1] + 48 * 9,
-                          'moat_horizontal')
-        self.add_tile(task1_pos[0] + 64,
-                      task1_pos[1] - 48,
-                      'moat_end_horizontal_flip')
-        self.add_tile(task1_pos[0] + 64,
-                      task1_pos[1] + 48 * 9,
+        self.add_tile(task1_pos[0] - 64 * 2,
+                      task1_pos[1] + 48,
+                      'moat_end_horizontal')
+        self.add_tile(task1_pos[0] + 64 * 6,
+                      task1_pos[1] + 48,
                       'moat_end_horizontal_flip')
 
         ### Task 2: Rolling stone