diff --git a/maps/world1.map b/maps/world1.map
index 16a5862..423099c 100644
Binary files a/maps/world1.map and b/maps/world1.map differ
diff --git a/src/sig/DrawLoop.java b/src/sig/DrawLoop.java
index a25e0bd..6fce3fe 100644
--- a/src/sig/DrawLoop.java
+++ b/src/sig/DrawLoop.java
@@ -11,6 +11,8 @@ import sig.engine.Rectangle;
 import sig.engine.Sprite;
 import sig.engine.String;
 import sig.engine.Transform;
+import sig.map.Map;
+import sig.objects.LevelRenderer;
 
 public class DrawLoop {
     public static Panel panel;
@@ -204,11 +206,13 @@ public class DrawLoop {
 
 
 	public static void Draw(byte[] canvas,int index, byte col) {
-		if(RabiClone.player!=null && RabiClone.player.isUnderwater()){
-			canvas[index]=(byte)((int)(col+33)&0xff);
+		int camera_y = (int)RabiClone.level_renderer.getY();
+		int y = index/RabiClone.BASE_WIDTH;
+		if(RabiClone.level_renderer!=null&&y<=RabiClone.CURRENT_MAP.getMap().getWaterLevel()-camera_y){
+			canvas[index]=(byte)((int)(col)&0xff);
 		}
 		else{
-			canvas[index]=(byte)((int)(col)&0xff);
+			canvas[index]=(byte)((int)(col+33)&0xff);
 		}
 	}
 }
diff --git a/src/sig/objects/LevelRenderer.java b/src/sig/objects/LevelRenderer.java
index 73977a0..6f56119 100644
--- a/src/sig/objects/LevelRenderer.java
+++ b/src/sig/objects/LevelRenderer.java
@@ -176,7 +176,9 @@ public class LevelRenderer extends Object{
         for (int y=0;y<RabiClone.BASE_HEIGHT;y++) {
             for (int x=0;x<RabiClone.BASE_WIDTH;x++) {
                 int index = y*RabiClone.BASE_WIDTH+x;
-                if(RabiClone.player!=null && RabiClone.player.isUnderwater()){
+                int camera_y = (int)RabiClone.level_renderer.getY();
+                int Y = index/RabiClone.BASE_WIDTH;
+                if(!(Y<=RabiClone.CURRENT_MAP.getMap().getWaterLevel()-camera_y)){
                     p[index] = (byte)(targetBackground.getPixels()[
                         ((y+(int)(getY()*targetBackground.getScrollSpeed()))%targetBackground.getHeight())*targetBackground.getWidth()+((x+(int)(getX()*targetBackground.getScrollSpeed()))%targetBackground.getWidth())
                     ]+33);