diff --git a/frontend/game.ts b/frontend/game.ts
index 3b88d6a..acf5a89 100644
--- a/frontend/game.ts
+++ b/frontend/game.ts
@@ -18,19 +18,22 @@ function setup() {
     raspberry.image = raspberryImagePath;
 
     obstacles.push(new Obstacle(
-        new Pipe(width, obstacleWidth, height),
-        new Pipe(width, obstacleWidth, height),
-        pipeImagePath
+        new Position(width, 0),
+        obstacleWidth,
+        height,
+        pipeImagePath,
     ));
     obstacles.push(new Obstacle(
-        new Pipe(width + obstacleOffset, obstacleWidth, height),
-        new Pipe(width + obstacleOffset, obstacleWidth, height),
-        pipeImagePath
+        new Position(width + obstacleOffset, 0),
+        obstacleWidth,
+        height,
+        pipeImagePath,
     ));
     obstacles.push(new Obstacle(
-        new Pipe(width + obstacleOffset * 2, obstacleWidth, height),
-        new Pipe(width + obstacleOffset * 2, obstacleWidth, height),
-        pipeImagePath
+        new Position(width + obstacleOffset * 2, 0),
+        obstacleWidth,
+        height,
+        pipeImagePath,
     ));
 
     obstacles.forEach((obstacle) => obstacle.resetPosition(false));
@@ -38,24 +41,20 @@ function setup() {
 
 function draw() {
     background(backgroundImage)
-    raspberry.update();
     raspberry.draw();
+    raspberry.update();
 
     obstacles.forEach((obstacle) => {
-        obstacle.update();
         obstacle.draw();
+        obstacle.update();
 
         if(obstacle.position.x < -obstacleWidth) {
             obstacle.resetPosition(true);
         }
-
-
     });
 }
 
-function keyPressed() {
-    if (key == "K" || key == "k") {
-        raspberry.boost();
-        console.log("BOOOST")
-    }
-}
\ No newline at end of file
+//
+// function keyPressed() {
+//
+// }
\ No newline at end of file
diff --git a/frontend/models/Obstacle.ts b/frontend/models/Obstacle.ts
index 4f7352a..1c2e6ef 100644
--- a/frontend/models/Obstacle.ts
+++ b/frontend/models/Obstacle.ts
@@ -11,10 +11,10 @@ class Obstacle extends Entity implements Collidable{
      * Constructs the Obstacle using the top and bottom Pipe
      * (fill is not used here)
      */
-    constructor(pipeTop: Pipe, pipeBottom: Pipe, pipeImagePath: string) {
-        super(pipeTop.position, pipeTop.width, pipeBottom.height, 0);
-        this.pipeTop = pipeTop;
-        this.pipeBottom = pipeBottom;
+    constructor(position: Position, obstacleWidth: number, obstacleHeight: number, pipeImagePath: string) {
+        super(position, obstacleWidth, obstacleHeight, 0);
+        this.pipeTop = new Pipe(position.x, obstacleWidth, obstacleHeight);
+        this.pipeBottom = new Pipe(position.x, obstacleWidth, obstacleHeight);
         this.pipeTop.image = pipeImagePath;
         this.pipeBottom.image = pipeImagePath;
 
@@ -42,6 +42,7 @@ class Obstacle extends Entity implements Collidable{
     public update(): void {
         this.pipeTop.position.x -= this.speed;
         this.pipeBottom.position.x -= this.speed;
+        this.position.x = this.pipeTop.position.x;
     }
 
     public draw(): void {