diff --git a/javascript/newsim.js b/javascript/newsim.js
index 3eb82ff..5eb3c16 100644
--- a/javascript/newsim.js
+++ b/javascript/newsim.js
@@ -221,7 +221,7 @@ function draw(){
     //Draw Tiled Background
     drawBackground(images["background"]);
 
-    for(let e = 1; e < simulator.length; e++){
+    for(var e = 1; e < simulator.length; e++){
         let entity = simulator[e]
         
         //Physics Update
@@ -231,22 +231,23 @@ function draw(){
 
         //Window Wrap
         if (Settings.windowWrap){
-            if (entity.x * (worldScale.value() /100) > windowWidth){
+            if (entity.x > windowWidth){
                 entity.x = 0;
             }
             if (entity.x < 0){
-                entity.x = windowWidth / (worldScale.value() /100);
+                entity.x = windowWidth;
             }
-            if (entity.y * (worldScale.value() /100) > windowHeight){
+            if (entity.y > windowHeight){
                 entity.y = 0;
             }
             if (entity.y < 0){
-                entity.y = windowHeight / (worldScale.value() /100);
+                entity.y = windowHeight;
             }
         }
         //Draw Entity
         drawEntity(entity);
     }
+
     if (Settings.respawn){
         if(Settings.emptyEntries.length > 5){
             if(frameCount % 20 == 0){