diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java b/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java
index 8ebd231..92a6e8e 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java
@@ -301,18 +301,32 @@ public class Scenario {
     public void createTargets() {
         switch(id) {
             case LVL_ANGER:
-                setTarget(Emotion.ANGER, 10, 1);
+                setTarget(Emotion.ANGER, 100, 1);
+                setTarget(Emotion.ANGER, 100, 2);
+                setTarget(Emotion.ANGER, 10, 3);
+                setTarget(Emotion.ANGER, 20, 4);
+                setTarget(Emotion.ANGER, 40, 5);
+                setTarget(Emotion.ANGER, 70, 6);
+                setTarget(Emotion.ANGER, 100, 7);
                 break;
             case LVL_JOY:
-                setTarget(Emotion.ANGER, 10, 1);
-                setTarget(Emotion.ANGER, 20, 2);
-                setTarget(Emotion.ANGER, 40, 3);
-                setTarget(Emotion.ANGER, 70, 4);
+                setTarget(Emotion.JOY, 100, 1);
+                setTarget(Emotion.JOY, 100, 2);
+                setTarget(Emotion.JOY, 100, 4);
+                setTarget(Emotion.CONTEMPT, 20, 4);
                 setTarget(Emotion.ANGER, 100, 5);
-                setTarget(Emotion.JOY, 100, 8);
-                setTarget(Emotion.ANGER, 100, 10);
-                setTarget(Emotion.JOY, 100, 15);
-                setTarget(Emotion.ANGER, 100, 20);
+                setTarget(Emotion.JOY, 100, 7);
+                setTarget(Emotion.ANGER, 100, 9);
+                setTarget(Emotion.JOY, 100, 11);
+                setTarget(Emotion.JOY, 70, 12);
+                setTarget(Emotion.JOY, 60, 13);
+                setTarget(Emotion.JOY, 30, 14);
+                setTarget(Emotion.JOY, 10, 14.5f);
+                setTarget(Emotion.ANGER, 100, 16);
+                setTarget(Emotion.JOY, 100, 17);
+                setTarget(Emotion.JOY, 100, 18);
+                setTarget(Emotion.JOY, 100, 19);
+                setTarget(Emotion.JOY, 100, 20);
                 break;
             case LVL_SURPRISE:
                 setTarget(Emotion.SURPRISE, 20, 1);
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java b/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
index 13ebae6..ad85c03 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
@@ -242,8 +242,8 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
     public void surfaceCreated(SurfaceHolder holder) {
         setWillNotDraw(false); //Allows us to use invalidate() to call onDraw()
 
-        this.setZOrderOnTop(true);
-        holder.setFormat(PixelFormat.TRANSPARENT);
+//        this.setZOrderOnTop(true);
+//        holder.setFormat(PixelFormat.TRANSPARENT);
 
 //        Log.e("TEST2", "Jaa2!");
         _thread = new PanelThread(getHolder(), this); //Start the thread that