diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
index 407955c..6921d95 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
@@ -21,11 +21,11 @@ public abstract class Card {
      * @param c
      */
     public Card(String UID,Context c) {
+        this.attack=getDefaultAttack();
+        this.health=getDefaultHealth();
         if(!(UID == null || c == null)) {
             drawableCard = new DrawableCard(this, 0, 0, UID, c);
         }
-        this.attack=getDefaultAttack();
-        this.health=getDefaultHealth();
     }
 
     public int getAttack() {
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
index 1c1a104..e973ee1 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
@@ -90,6 +90,7 @@ public class GameLogicThread extends Thread{
         //pickDeck();
 
         //loading textures
+        Log.i("ressources","loading bitmaps");
         Bitmap bitmapYourTurn = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_your_turn);
         Bitmap bitmapEnemyTurn = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_enemy_turn);
         Bitmap bitmapBattlePhase = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_battlephase);
@@ -97,6 +98,7 @@ public class GameLogicThread extends Thread{
         Bitmap bitmapVictory =  BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_pb_victory);
         Bitmap bitmapDefeat =  BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_pb_defeat);
 
+        Log.i("loading","prefs");
         SharedPreferences sharedPref = gameActivity.getSharedPreferences("handicape",Context.MODE_PRIVATE);
         boolean modeHandicape = sharedPref.getBoolean(gameActivity.getString(R.string.handicape), false);
 
@@ -109,6 +111,8 @@ public class GameLogicThread extends Thread{
 
         }
 
+        Log.i("ressources","base ressources loaded");
+
         //adding the background
         renderer.addToDraw(new DrawableBitmap(bitmapBackground, 0,0, "background", 100, 100 ));
         //drawHandPreview();
@@ -119,9 +123,7 @@ public class GameLogicThread extends Thread{
         final int port = 17057;
 
         //gameativity.finish() n'etait pas utilisable il fermais l'application
-        Intent intent = new Intent(gameActivity,MainActivity.class);
-        //on reset le top et recrée l'activité principale
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
         try {
             Socket client = new Socket(host, port);
             coms= new Communication(client);
@@ -129,7 +131,7 @@ public class GameLogicThread extends Thread{
             Log.e("ERROR SERVER DEAD","srv");
             gameActivity.runOnUiThread(new PopupRunable("erreur de comunication avec le serveur",gameActivity));
             renderer.terminate();
-            gameActivity.startActivity(intent);
+            returnToTheMainActivity();
             return;
         }
         renderer.updateFrame();
@@ -235,7 +237,7 @@ public class GameLogicThread extends Thread{
                         renderer.updateFrame();
                         cancelled = true;
                         currentThread().sleep(2000);
-                        gameActivity.startActivity(intent);
+                        returnToTheMainActivity();
                         break;
                     case Command.LOSE:
                         //on termine la partie
@@ -245,7 +247,7 @@ public class GameLogicThread extends Thread{
                         cancelled=true;
                         currentThread().sleep(2000);
                         //gameativity.finish() n'etait pas utilisable il fermais l'application
-                        gameActivity.startActivity(intent);
+                        returnToTheMainActivity();
                         break;
                     case Command.PING:
                         coms.send(Command.PONG);
@@ -378,6 +380,18 @@ public class GameLogicThread extends Thread{
         }
     }
 
+    private void returnToTheMainActivity() {
+        gameActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Intent intent = new Intent(gameActivity,MainActivity.class);
+                //on reset le top et recrée l'activité principale
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                gameActivity.startActivity(intent);
+            }
+        });
+    }
+
     /**
      * cette methode permet d'afficher la main
      */
diff --git a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
index 2293fc7..263ff92 100644
--- a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
+++ b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
@@ -62,7 +62,7 @@ public class GameActivity extends Activity {
     protected void onDestroy() {
         super.onDestroy();
         //kill les threads
-        System.exit(0);
+        //System.exit(0);
     }
 
     @Override
diff --git a/app/src/main/java/com/iutlaval/myapplication/PopupRunable.java b/app/src/main/java/com/iutlaval/myapplication/PopupRunable.java
index 1ad9189..e8c73d7 100644
--- a/app/src/main/java/com/iutlaval/myapplication/PopupRunable.java
+++ b/app/src/main/java/com/iutlaval/myapplication/PopupRunable.java
@@ -15,9 +15,7 @@ public class PopupRunable implements Runnable{
 
     @Override
     public void run() {
-        Toast popupToast = new Toast(context);
-        popupToast.setText(recivedMessage);
-        popupToast.setDuration(Toast.LENGTH_LONG);
+        Toast popupToast = Toast.makeText(context,recivedMessage,Toast.LENGTH_LONG);
         popupToast.show();
     }
 }
diff --git a/app/src/main/res/drawable/t_pb_enemy_turn.png b/app/src/main/res/drawable/t_pb_enemy_turn.png
index ff7cfb2..1980ade 100644
Binary files a/app/src/main/res/drawable/t_pb_enemy_turn.png and b/app/src/main/res/drawable/t_pb_enemy_turn.png differ