diff --git a/frontend/game.ts b/frontend/game.ts
index 444af17..0d01dba 100644
--- a/frontend/game.ts
+++ b/frontend/game.ts
@@ -1,5 +1,5 @@
 const pipeImagePath: string = "resources/raspberry-low-res.png";
-const obstacleWidth: number = 42;
+const obstacleWidth: number = 88;
 let obstacleOffset: number;
 const backgroundImagePath: string = "resources/raspberry-low-res.png";
 let backgroundImage: any;
diff --git a/frontend/models/Obstacle.ts b/frontend/models/Obstacle.ts
index d239d5e..39df256 100644
--- a/frontend/models/Obstacle.ts
+++ b/frontend/models/Obstacle.ts
@@ -1,8 +1,8 @@
-class Obstacle extends Entity implements Collidable{
+class Obstacle extends Entity implements Collidable {
     private pipeTop: Pipe;
     private pipeBottom: Pipe;
     private readonly distanceBetweenPipes: number;
-    private readonly padding: number = 300;
+    private readonly padding: number = 150;
     private readonly speed: number = 3;
 
     private static startX: number;
@@ -23,13 +23,12 @@ class Obstacle extends Entity implements Collidable{
     }
 
     public resetPosition(resetX: boolean): void {
-        this.pipeBottom.position.y =
-            this.distanceBetweenPipes + this.randomRange(0, height - this.padding - 1.2 * this.distanceBetweenPipes);
+        this.pipeTop.height = this.randomRange(this.padding, height - this.padding - this.distanceBetweenPipes);
+        this.pipeTop.position.y = 0;
+        this.pipeBottom.position.y = this.pipeTop.height + this.distanceBetweenPipes;
+        this.pipeBottom.height = height - this.pipeTop.height - this.padding;
 
-        this.pipeTop.position.y =
-            this.pipeBottom.position.y - this.distanceBetweenPipes - this.pipeTop.height;
-
-        if(resetX){
+        if (resetX) {
             this.pipeBottom.position.x = Obstacle.startX;
             this.pipeTop.position.x = Obstacle.startX;
         }
diff --git a/frontend/models/Raspberry.ts b/frontend/models/Raspberry.ts
index d844175..c8a90d6 100644
--- a/frontend/models/Raspberry.ts
+++ b/frontend/models/Raspberry.ts
@@ -58,14 +58,16 @@ class Raspberry extends Entity {
 
     public draw(): void {
         push();
-        image(this.image, this.position.x, this.position.y, this.width, this.height);
         noFill();
+        translate(this.position.x, this.position.y);
+        rotate((PI/2)*(this.velocity/Raspberry.maxVelocity));
+        image(this.image, 0, 0, this.width, this.height);
         if (!this.showHitbox) {
             noStroke();
         }
         rect(
-            this.position.x,
-            this.position.y,
+            0,
+            0,
             this.width,
             this.height
         );