diff --git a/runGame.command b/runGame.command
index 6677ab1..ecab5f4 100755
--- a/runGame.command
+++ b/runGame.command
@@ -1,3 +1,3 @@
 cd bin
-java -Djava.library.path="../lib" -Dsun.java2d.opengl=true -Xms2G -Xmx2G -jar RabiClone.jar
+java -Djava.library.path="../lib" -Xms2G -Xmx2G -jar RabiClone.jar
 cd ..
\ No newline at end of file
diff --git a/runGame.ps1 b/runGame.ps1
index 5129923..6e2680c 100755
--- a/runGame.ps1
+++ b/runGame.ps1
@@ -1,3 +1,3 @@
 cd bin
-java "-Djava.library.path=../lib" "-Dsun.java2d.opengl=true" -Xms2G -Xmx2G -jar RabiClone.jar
+java "-Djava.library.path=../lib" -Xms2G -Xmx2G -jar RabiClone.jar
 cd ..
\ No newline at end of file
diff --git a/runGame.sh b/runGame.sh
index 5c21484..ecab5f4 100755
--- a/runGame.sh
+++ b/runGame.sh
@@ -1,3 +1,3 @@
 cd bin
-java -Dsun.java2d.opengl=true -Djava.library.path="../lib" -Xms2G -Xmx2G -jar RabiClone.jar
+java -Djava.library.path="../lib" -Xms2G -Xmx2G -jar RabiClone.jar
 cd ..
\ No newline at end of file
diff --git a/sig b/sig
index ea90775..5c36672 100755
--- a/sig
+++ b/sig
@@ -8,7 +8,7 @@ define MAIN_CLASS "sig.${PROJECT_NAME}"
 define OUT_DIR "bin"
 define LIBRARY_PATH "../lib"
 define CLASS_PATH "${PROJECT_DIR}/..:lib/bin"
-define CUSTOM_PARAMS "-Xmx2G -Xms2G -Dsun.java2d.opengl=true"
+define CUSTOM_PARAMS "-Xmx2G -Xms2G"
 define LANGUAGE "Java"
 
 source utils/main.sh
\ No newline at end of file
diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java
index fd16bfe..27aedd0 100644
--- a/src/sig/RabiClone.java
+++ b/src/sig/RabiClone.java
@@ -80,6 +80,7 @@ public class RabiClone {
 				(int) ((Toolkit.getDefaultToolkit().getScreenSize().getHeight() - f.getHeight()) / 2));
 		f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		f.setVisible(true);
+		f.createBufferStrategy(2);
 
 		OBJ.add(level_renderer = new LevelRenderer(p));
 		StartGame();
diff --git a/src/sig/engine/Panel.java b/src/sig/engine/Panel.java
index 1d1f09c..6b92840 100644
--- a/src/sig/engine/Panel.java
+++ b/src/sig/engine/Panel.java
@@ -194,13 +194,13 @@ public class Panel extends JPanel implements Runnable,KeyListener {
 
     @Override
     public void paintComponent(Graphics g) {
-        super.paintComponent(g);
+        super.paintComponent(RabiClone.f.getBufferStrategy().getDrawGraphics());
         // perform draws on pixels
         render();
         // ask ImageProducer to update image
         mImageProducer.newPixels();  
         // draw it on panel          
-		g.drawImage(this.imageBuffer,0,0,getWidth(),getHeight(),0,0,RabiClone.BASE_WIDTH,RabiClone.BASE_HEIGHT,this);
+		RabiClone.f.getBufferStrategy().getDrawGraphics().drawImage(this.imageBuffer,0,0,getWidth(),getHeight(),0,0,RabiClone.BASE_WIDTH,RabiClone.BASE_HEIGHT,this);
 		updateFPSCounter();
     }