diff --git a/bin/box2DWorld/Polygon.class b/bin/box2DWorld/Polygon.class
index 839d198..cc65c36 100644
Binary files a/bin/box2DWorld/Polygon.class and b/bin/box2DWorld/Polygon.class differ
diff --git a/bin/data/ContentGenerator.class b/bin/data/ContentGenerator.class
index d5579d1..8f579b9 100644
Binary files a/bin/data/ContentGenerator.class and b/bin/data/ContentGenerator.class differ
diff --git a/bin/data/Image.class b/bin/data/Image.class
index 4d0f4c9..4744e32 100644
Binary files a/bin/data/Image.class and b/bin/data/Image.class differ
diff --git a/bin/data/Video.class b/bin/data/Video.class
index 79c0bd4..f2461c3 100644
Binary files a/bin/data/Video.class and b/bin/data/Video.class differ
diff --git a/bin/display/MuseumFinal.class b/bin/display/MuseumFinal.class
index 1896300..b9a6839 100644
Binary files a/bin/display/MuseumFinal.class and b/bin/display/MuseumFinal.class differ
diff --git a/bin/glass/Crack.class b/bin/glass/Crack.class
index 9a552b5..be3d389 100644
Binary files a/bin/glass/Crack.class and b/bin/glass/Crack.class differ
diff --git a/bin/glass/GlassPlane.class b/bin/glass/GlassPlane.class
index ec3a981..0e022fc 100644
Binary files a/bin/glass/GlassPlane.class and b/bin/glass/GlassPlane.class differ
diff --git a/bin/helpers/VoronoiBuilder.class b/bin/helpers/VoronoiBuilder.class
index 9469ad8..bbff32a 100644
Binary files a/bin/helpers/VoronoiBuilder.class and b/bin/helpers/VoronoiBuilder.class differ
diff --git a/bin/movement/MovementHandler.class b/bin/movement/MovementHandler.class
index aa609ab..353281e 100644
Binary files a/bin/movement/MovementHandler.class and b/bin/movement/MovementHandler.class differ
diff --git a/bin/movement/OSCReceiver.class b/bin/movement/OSCReceiver.class
index 333757b..50afc6b 100644
Binary files a/bin/movement/OSCReceiver.class and b/bin/movement/OSCReceiver.class differ
diff --git a/bin/persons/TriggerBox.class b/bin/persons/TriggerBox.class
index 5bb778e..530eca1 100644
Binary files a/bin/persons/TriggerBox.class and b/bin/persons/TriggerBox.class differ
diff --git a/src/box2DWorld/Polygon.java b/src/box2DWorld/Polygon.java
index 88d4f3b..f2be5ad 100644
--- a/src/box2DWorld/Polygon.java
+++ b/src/box2DWorld/Polygon.java
@@ -8,6 +8,7 @@
 import org.jbox2d.dynamics.Fixture;
 import org.jbox2d.dynamics.FixtureDef;
 
+import display.MuseumFinal;
 import glass.Fragment;
 import processing.core.PApplet;
 import processing.core.PVector;
@@ -89,8 +90,8 @@ public void display() {
 		p.pushMatrix();
 		p.translate(pos.x, pos.y);
 		p.rotate(-a);
-		p.fill(255);
-		p.stroke(0);
+		p.fill(p.color(139,137,137,200));
+		p.stroke(MuseumFinal.secondColor);
 		p.beginShape();
 		// For every vertex, convert to pixel vector
 		for (int i = 0; i < ps.getVertexCount(); i++) {
diff --git a/src/data/ContentGenerator.java b/src/data/ContentGenerator.java
index 1b792ed..7f07d05 100644
--- a/src/data/ContentGenerator.java
+++ b/src/data/ContentGenerator.java
@@ -45,7 +45,8 @@ private void initialize(List list, String path) {
 
 					list.add(new Image(p, p.loadImage(fileName)));
 				}
-				if (fileName.endsWith(".avi") || fileName.endsWith(".mp4")) {
+				if (fileName.endsWith(".avi") || fileName.endsWith(".mp4")
+						|| fileName.endsWith(".mov")) {
 
 					list.add(new Video(p, new Movie(p, fileName)));
 				}
@@ -64,6 +65,9 @@ public Image getRandomImage(int maxWidth, int maxHeight) {
 			}
 		}
 
+		if (possibleImages.size() < 1)
+			return null;
+
 		int index = randomizer.nextInt(possibleImages.size());
 
 		return possibleImages.get(index);
@@ -75,17 +79,22 @@ public Video getRandomVideo(int maxWidth, int maxHeight) {
 		ArrayList<Video> possibleMovies = new ArrayList<Video>();
 		for (Video video : (ArrayList<Video>) videos) {
 
-			if (video.getResizedWidth() < maxWidth && video.getResizedWidth() < maxHeight) {
+			if (video.getResizedWidth() <= maxWidth && video.getResizedHeight() <= maxHeight) {
+
 				possibleMovies.add(video);
 			}
 		}
 
-		if (possibleMovies.size() < 0)
+		if (possibleMovies.size() < 1)
 			return null;
 
 		int index = randomizer.nextInt(possibleMovies.size());
 
-		return possibleMovies.get(index);
+		Video video = possibleMovies.get(index);
+
+		video.getMovie().jump(0);
+
+		return video;
 	}
 
 	public boolean isReady() {
diff --git a/src/data/Image.java b/src/data/Image.java
index 6a7129c..b707bfc 100644
--- a/src/data/Image.java
+++ b/src/data/Image.java
@@ -23,7 +23,7 @@ public Image(PApplet p, PImage image) {
 		resizedHeight = originalHeight;
 
 		// resize Image
-		if (image.width > MuseumFinal.maxImageWidth || image.height > MuseumFinal.maxImageHeight) {
+		if (image.width >= MuseumFinal.maxImageWidth || image.height >= MuseumFinal.maxImageHeight) {
 
 			int tempResizeWidth = image.width / MuseumFinal.scaleFactor;
 			int tempResizeHeight = image.height / MuseumFinal.scaleFactor;
diff --git a/src/data/Video.java b/src/data/Video.java
index 8230248..2d1898f 100644
--- a/src/data/Video.java
+++ b/src/data/Video.java
@@ -15,15 +15,14 @@ public class Video {
 	public Video(PApplet p, Movie video) {
 		this.video = video;
 		this.video.play();
-		this.video.volume(0);
 		this.video.read();
 		
 		resizedWidth = this.video.width;
 		resizedHeight = this.video.height;
 
 		// resize Video
-		if (resizedWidth > MuseumFinal.maxImageWidth
-				|| resizedHeight > MuseumFinal.maxImageHeight) {
+		if (resizedWidth >= 1280
+				|| resizedHeight >= 720) {
 			
 			int tempResizeWidth = this.video.width / MuseumFinal.scaleFactor;
 			int tempResizeHeight = this.video.height / MuseumFinal.scaleFactor;
@@ -31,8 +30,8 @@ public Video(PApplet p, Movie video) {
 			resizedHeight = tempResizeHeight;
 
 			int i = 1;
-			while (resizedWidth <= MuseumFinal.maxImageWidth
-					&& resizedHeight <= MuseumFinal.maxImageHeight) {
+			while (resizedWidth <= 1280
+					&& resizedHeight <= 720) {
 
 				i++;
 				resizedWidth = tempResizeWidth * i;
@@ -42,6 +41,8 @@ public Video(PApplet p, Movie video) {
 			resizedWidth -= tempResizeWidth;
 			resizedHeight -= tempResizeHeight;
 		}
+		
+		this.video.pause();
 	}
 
 	public Movie getMovie() {
diff --git a/src/display/MuseumFinal.java b/src/display/MuseumFinal.java
index 6ac5b11..9c5f2c3 100644
--- a/src/display/MuseumFinal.java
+++ b/src/display/MuseumFinal.java
@@ -8,6 +8,7 @@
 import data.ContentGenerator;
 import ddf.minim.AudioOutput;
 import ddf.minim.AudioPlayer;
+import ddf.minim.AudioSample;
 import ddf.minim.Minim;
 import ddf.minim.effects.BandPass;
 import ddf.minim.ugens.FilePlayer;
@@ -28,8 +29,8 @@
 
 public class MuseumFinal extends PApplet {
 
-	public static final int firstColor = 255;
-	public static final int secondColor = 0;
+	public final int firstColor = color(139, 137, 137);
+	public static final int secondColor = 255;
 	public static final int strokeStrength = 1;
 
 	public static final int formFactorX = 16;
@@ -43,6 +44,7 @@ public class MuseumFinal extends PApplet {
 	public static final int showTime = 6000;
 
 	public static final int cutAmount = 250;
+	public static int destroyableCuts = 0;
 	public static final int interactionSteps = 5;
 
 	private MovementHandler movementHandler;
@@ -56,17 +58,22 @@ public class MuseumFinal extends PApplet {
 
 	private ContentGenerator generator;
 
+	public static Minim minim;
+	public static ArrayList<AudioSample> glassBreakSamples;
+	public static int breakCounter;
+
 	@Override
 	public void settings() {
 
-		size(1280, 800, P2D);
-		// fullScreen(P2D);
+		// size(1280,800, P2D);
+		fullScreen(P2D);
 		smooth(8);
 	}
 
 	@Override
 	public void setup() {
 
+		noCursor();
 		background(firstColor);
 		maxImageWidth = width;
 		maxImageHeight = height;
@@ -75,19 +82,10 @@ public void setup() {
 
 		glass = new GlassPlane(this, maxImageWidth, maxImageHeight);
 
-		generator = new ContentGenerator(this, "/Users/Moritz/Dropbox/TellImage",
-				"/Users/Moritz/Dropbox/TellVideo");
+		generator = new ContentGenerator(this, "/Users/Moritz/Desktop/TellImage",
+				"/Users/Moritz/Desktop/TellVideo");
 
-		//
-		// Minim minim = new Minim(this);
-		// AudioOutput output = minim.getLineOut();
-		// FilePlayer sound1 = new
-		// FilePlayer(minim.loadFileStream("/Users/Moritz/Dropbox/Sound/Crack/SuddenCrack.wav"));
-		// BandPass bpf = new BandPass(440, 20, output.sampleRate());
-		// bpf.setFreq(300);
-		// bpf.setBandWidth(500);
-		// sound1.patch(bpf).patch(output);
-		// sound1.loop();
+		initiateAudio();
 
 		box2dWorld = new Box2DProcessing(this);
 		box2dWorld.createWorld();
@@ -108,6 +106,7 @@ public void draw() {
 
 		background(firstColor);
 		box2dWorld.step();
+		box2dWorld.step();
 		strokeWeight(strokeStrength);
 
 		updateCrack();
@@ -115,7 +114,7 @@ public void draw() {
 		displayAll();
 
 		fill(0);
-		text(frameRate, 20, 20);
+		// text(frameRate, 20, 20);
 	}
 
 	public void updateCrack() {
@@ -124,7 +123,7 @@ public void updateCrack() {
 
 			if (glass.getCrack() == null) {
 
-				if (Math.random() < 0) {
+				if (Math.random() < 0.4f) {
 
 					glass.crack(width / 2, height / 2,
 							generator.getRandomVideo(maxImageWidth, maxImageHeight));
@@ -145,75 +144,81 @@ public void updateCrack() {
 					if (glass.getCrack().getStage() == Stage.WHOLE) {
 
 						// glass.getCrack().breakParts(this, box2dWorld, mouseX,
-						// mouseY, 1, PVector.random2D());
+						// mouseY, 3,
+						// PVector.random2D());
 						if (movementHandler.updateReady()) {
 
 							Iterator<Person> iterator = movementHandler.getPersons().values()
 									.iterator();
 
-							Iterator<TriggerBox> boxIterator = movementHandler.getTriggerZones()
-									.values().iterator();
-
 							while (iterator.hasNext()) {
 
 								Person person = iterator.next();
+
+								// Iterator<TriggerBox> boxIterator =
+								// movementHandler.getTriggerZones()
+								// .values().iterator();
+								//
+								// while (boxIterator.hasNext()) {
+								//
+								// TriggerBox box = boxIterator.next();
+								//
+								// if (box.getID().equals("0-Triggerbox 1")) {
+								//
+								// if
+								// (box.getPointsPerPerson().containsKey(person.getId()))
+								// {
+								//
+								// }
+								// }
+								// break;
+								// }
+
 								PVector centroid = person.getCentroid();
+								if (centroid.x > 1 || centroid.y > 1)
+									continue;
 								PVector velocity = person.getVelocity();
 
 								if (velocity == null) {
 									velocity = PVector.random2D();
 								}
+
+								if (centroid.x < 0.1) {
+
+									continue;
+								}
+
+								if (centroid.x > 0.7) {
+
+									continue;
+								}
+
 								centroid.x *= width;
 
-								// how much will break
-								if (centroid.y < 0.2) {
+								if (centroid.y < 0.3) {
 
 									glass.getCrack().breakParts(this, box2dWorld, centroid.x,
 											height / 2, 1, velocity);
+								} else if (centroid.y < 0.5) {
+
+									glass.getCrack().breakParts(this, box2dWorld, centroid.x,
+											height / 2, 3, velocity);
 								} else {
-									if (centroid.y < 0.4) {
+									if (centroid.y < 0.7) {
 
 										glass.getCrack().breakParts(this, box2dWorld, centroid.x,
-												height / 2, 2, velocity);
+												height / 2, 4, velocity);
 									} else {
-										if (centroid.y < 0.6) {
-											// while (boxIterator.hasNext()) {
-											//
-											// TriggerBox box =
-											// boxIterator.next();
-											// if (box.getPointsInsideBox() !=
-											// 0) {
-											// System.out.println("----Person-----");
-											// System.out.println(person.getId());
-											// Iterator<Integer> hm =
-											// box.getPointsPerPerson()
-											// .keySet().iterator();
-											// while(hm.hasNext()){
-											// System.out.println("----trigger----");
-											// System.out.println(hm.next());
-											// }
-											// // if
-											// // (box.getPointsPerPerson()
-											// // .containsKey(person.getId()))
-											// // {
-											// //
-											// // }
-											// }
-											// }
-
-											glass.getCrack().breakParts(this, box2dWorld,
-													centroid.x, height / 2, 3, velocity);
-										} else {
-											if (centroid.y < 0.8) {
+										if (centroid.y < 1) {
 
-												glass.getCrack().breakParts(this, box2dWorld,
-														centroid.x, height / 2, 4, velocity);
+											if (person.getAge() > 10) {
+
+												glass.getCrack().breakCrack(this, box2dWorld,
+														velocity);
 											} else {
-												if (centroid.y < 1) {
 
-													glass.getCrack().breakCrack(this, box2dWorld,
-															velocity);
-												}
+												glass.getCrack().breakParts(this, box2dWorld,
+														centroid.x, height / 2, 4, velocity);
 											}
 										}
 									}
@@ -248,6 +253,7 @@ public void displayAll() {
 				} else {
 
 					tint(255, crack.getVisiblity());
+
 					image(crack.getVideo().getMovie(), crack.getBoundingBox().get(0).x,
 							crack.getBoundingBox().get(0).y);
 				}
@@ -354,6 +360,20 @@ public void mousePressed() {
 				glass.getCrack().breakCrack(this, box2dWorld, PVector.random2D());
 			}
 		}
+	}
+
+	public void initiateAudio() {
+
+		minim = new Minim(this);
+		AudioPlayer loopPlayer = minim.loadFile("/Users/Moritz/Desktop/FinalSound.mp3");
+		loopPlayer.loop();
 
+		glassBreakSamples = new ArrayList<AudioSample>();
+		glassBreakSamples.add(minim.loadSample("/Users/Moritz/Desktop/SoundFinal/1.wav"));
+		glassBreakSamples.add(minim.loadSample("/Users/Moritz/Desktop/SoundFinal/2.wav"));
+		glassBreakSamples.add(minim.loadSample("/Users/Moritz/Desktop/SoundFinal/3.wav"));
+		glassBreakSamples.add(minim.loadSample("/Users/Moritz/Desktop/SoundFinal/4.wav"));
+		glassBreakSamples.add(minim.loadSample("/Users/Moritz/Desktop/SoundFinal/5.wav"));
+		breakCounter = 0;
 	}
 }
diff --git a/src/glass/Crack.java b/src/glass/Crack.java
index c6ff9b9..ac0fa64 100644
--- a/src/glass/Crack.java
+++ b/src/glass/Crack.java
@@ -28,7 +28,6 @@ public class Crack {
 
 	private int visibility;
 	private long breakTime;
-	private long fadeTime;
 
 	private long lastUpdate;
 
@@ -119,11 +118,52 @@ public int getVisiblity() {
 	public void breakCrack(PApplet p, Box2DProcessing box2d, PVector velocity) {
 
 		lastUpdate = System.currentTimeMillis();
+		
+		boolean alreadyBroken = true;
 
 		for (Fragment fragment : fragments) {
 
-			if (!fragment.isBroken())
-				box2dWorldPolygons.add(new Polygon(p, box2d, fragment, velocity, 50));
+			if (!fragment.isBroken()) {
+				box2dWorldPolygons
+						.add(new Polygon(p, box2d, fragment, velocity, p.random(50, 120)));
+				fragment.setBroken(true);
+				alreadyBroken = false;
+			}
+		}
+		
+		if(!alreadyBroken){
+			
+			MuseumFinal.glassBreakSamples.get(MuseumFinal.breakCounter).trigger();
+			MuseumFinal.breakCounter++;
+			MuseumFinal.breakCounter = MuseumFinal.breakCounter % MuseumFinal.glassBreakSamples.size();
+		}
+
+		// make all hidden lines visible
+		for (Fragment fragment : hiddenFragments) {
+
+			for (Line line : fragment.getLines()) {
+
+				line.setVisiblity(true);
+			}
+		}
+		fragments.clear();
+
+		stage = Stage.BROKEN;
+		if (cracktype == CrackType.MOVIE)
+			movie.getMovie().play();
+		breakTime = System.currentTimeMillis();
+	}
+
+	public void letCrackFall(PApplet p, Box2DProcessing box2d, PVector velocity) {
+
+		lastUpdate = System.currentTimeMillis();
+
+		for (Fragment fragment : fragments) {
+
+			if (!fragment.isBroken()) {
+				box2dWorldPolygons.add(new Polygon(p, box2d, fragment, velocity, 30));
+				fragment.setBroken(true);
+			}
 		}
 
 		// make all hidden lines visible
@@ -137,6 +177,8 @@ public void breakCrack(PApplet p, Box2DProcessing box2d, PVector velocity) {
 		fragments.clear();
 
 		stage = Stage.BROKEN;
+		if (cracktype == CrackType.MOVIE)
+			movie.getMovie().play();
 		breakTime = System.currentTimeMillis();
 	}
 
@@ -145,11 +187,10 @@ public void breakParts(PApplet p, Box2DProcessing box2d, float xPoint, float yPo
 
 		lastUpdate = System.currentTimeMillis();
 
-		// If there are less than half of the fragments break all
-		// if (fragments.size() / 2 < crackAmount) {
-		//
-		// breakCrack(p, box2d, velocity);
-		// }
+		if (crackAmount > MuseumFinal.destroyableCuts / 1.3f) {
+
+			letCrackFall(p, box2d, velocity);
+		}
 
 		// calculate rectangle size
 		float rectangleWidth = minInteractionWidthHeight.x * interactionStep;
@@ -188,7 +229,6 @@ public void breakParts(PApplet p, Box2DProcessing box2d, float xPoint, float yPo
 			// breaks out
 			if (fragment.isVisible() && !fragment.isBroken() && fragmentIsInRange) {
 
-				// TODO maybe also use velocity?!
 				if (Math.random() < 0.01f) {
 
 					breakFragment(fragment, p, box2d, velocity, 0);
@@ -244,11 +284,9 @@ public void updateCrack() {
 
 				if (movie.getMovie().available()) {
 					movie.getMovie().read();
-				}
+				} else if (movie.getMovie().duration() == movie.getMovie().time()) {
 
-				if (movie.getMovie().time() == movie.getMovie().duration()) {
-					movie.getMovie().jump(0);
-					movie.getMovie().read();
+					movie.getMovie().pause();
 					stage = Stage.FADING;
 				}
 			}
@@ -278,33 +316,12 @@ public void updateCrack() {
 		}
 	}
 
-	// public void breakLooseFragments(Fragment fragment, PApplet p,
-	// Box2DProcessing box2d,
-	// PVector velocity, int i) {
-	//
-	// boolean breaks = true;
-	//
-	// // Check all neighbors of the given fragment
-	// for (Fragment temporaryFragment : fragment.getNeighbors()) {
-	//
-	// // if a fragment is not broken, we have an adjacent neigbhor
-	// // so it doesn't have to break
-	// if (!temporaryFragment.isBroken()) {
-	// breaks = false;
-	// }
-	// }
-	//
-	// if (breaks) {
-	//
-	// breakFragment(fragment, p, box2d, velocity, i);
-	// }
-	// }
-
 	public void breakFragment(Fragment fragment, PApplet p, Box2DProcessing box2d, PVector velocity,
 			int i) {
 
 		// TODO check velocity and angular values
 		box2dWorldPolygons.add(new Polygon(p, box2d, fragment, velocity, 5));
+		crackAmount++;
 
 		// Remove fragment from List, since it's broken out
 		fragment.setBroken(true);
@@ -326,6 +343,7 @@ private void destroyAllNeighBors(Fragment fragment2, PApplet p, Box2DProcessing
 			PVector velocity) {
 
 		box2dWorldPolygons.add(new Polygon(p, box2d, fragment2, velocity, 5));
+		crackAmount++;
 
 		// Remove fragment from List, since it's broken out
 		fragment2.setBroken(true);
diff --git a/src/glass/GlassPlane.java b/src/glass/GlassPlane.java
index b282843..e6d2375 100644
--- a/src/glass/GlassPlane.java
+++ b/src/glass/GlassPlane.java
@@ -42,8 +42,11 @@ public boolean isOccupied(float x, float y) {
 	 * @param crackheight
 	 */
 	public void crack(int centroidX, int centroidY, Image image) {
-		
-		if(image == null)
+
+		if (image == null)
+			return;
+
+		if (image.getResizedWidth() == 0 || image.getResizedHeight() == 0)
 			return;
 
 		Crack temporaryCrack = VoronoiBuilder.createVoronoiCrack(p, centroidX, centroidY,
@@ -61,6 +64,9 @@ public void crack(int centroidX, int centroidY, Video video) {
 		if (video == null)
 			return;
 
+		if (video.getResizedWidth() == 0 || video.getResizedHeight() == 0)
+			return;
+
 		Crack temporaryCrack = VoronoiBuilder.createVoronoiCrack(p, centroidX, centroidY,
 				video.getResizedWidth(), video.getResizedHeight());
 
diff --git a/src/helpers/VoronoiBuilder.java b/src/helpers/VoronoiBuilder.java
index 83d0c77..4dceca8 100644
--- a/src/helpers/VoronoiBuilder.java
+++ b/src/helpers/VoronoiBuilder.java
@@ -25,6 +25,8 @@ public class VoronoiBuilder {
 	 */
 	public static Crack createVoronoiCrack(PApplet p, int centerX, int centerY, int width,
 			int height) {
+		
+		MuseumFinal.destroyableCuts = 0;
 
 		ArrayList<Fragment> fragments = new ArrayList<Fragment>();
 		ArrayList<Fragment> hiddenFragments = new ArrayList<Fragment>();
@@ -75,6 +77,8 @@ public static Crack createVoronoiCrack(PApplet p, int centerX, int centerY, int
 
 			} else {
 
+				MuseumFinal.destroyableCuts++;
+				
 				addLines(temporaryFragment, LineType.FRAGMENT, centerX, centerY);
 
 				fragments.add(temporaryFragment);
diff --git a/src/movement/MovementHandler.java b/src/movement/MovementHandler.java
index c047c77..5b124ae 100644
--- a/src/movement/MovementHandler.java
+++ b/src/movement/MovementHandler.java
@@ -35,7 +35,7 @@ public void personMoved(Person tempPerson) {
 	}
 
 	public void updateTriggerZone(String id, int pointsInsideBox,
-			HashMap<Integer, Integer> pointsperPerson, Long valueOf) {
+			HashMap<String, Integer> pointsperPerson, Long valueOf) {
 
 		if (triggerzones.containsKey(id)) {
 
diff --git a/src/movement/OSCReceiver.java b/src/movement/OSCReceiver.java
index fbe6f33..b512b8f 100644
--- a/src/movement/OSCReceiver.java
+++ b/src/movement/OSCReceiver.java
@@ -18,7 +18,7 @@ public class OSCReceiver implements OscEventListener {
 	private OscProperties properties;
 
 	public OSCReceiver(MovementHandler handler) {
-		
+
 		properties = new OscProperties();
 		properties.setDatagramSize(65536);
 		properties.setListeningPort(9999);
@@ -29,7 +29,7 @@ public OSCReceiver(MovementHandler handler) {
 	public void interrupt() {
 		oscReceiver.stop();
 	}
-	
+
 	@Override
 	public void oscEvent(OscMessage message) {
 
@@ -93,7 +93,7 @@ public void oscEvent(OscMessage message) {
 			} else if (messageType.equals("/argusClient/triggerzone")) {
 				String id = null;
 				int pointsInsideBox = 0;
-				HashMap<Integer, Integer> pointsperPerson = new HashMap<Integer, Integer>();
+				HashMap<String, Integer> pointsperPerson = new HashMap<String, Integer>();
 
 				for (int i = 0; i < typetag.length(); i++) {
 
@@ -101,12 +101,13 @@ public void oscEvent(OscMessage message) {
 						if (message.get(i).stringValue().equals("set")) {
 
 							id = message.get(++i).stringValue();
-							i+=2;
+							i += 2;
 							pointsInsideBox = message.get(i).intValue();
-							i+=2;
-							while (typetag.charAt(i) == 'i') {
+							i += 2;
+							while (typetag.charAt(i) == 's'
+									&& !message.get(i).stringValue().equals("fseq")) {
 
-								pointsperPerson.put(message.get(i++).intValue(),
+								pointsperPerson.put(message.get(i++).stringValue(),
 										message.get(i++).intValue());
 							}
 							i--;
@@ -114,7 +115,7 @@ public void oscEvent(OscMessage message) {
 							if (message.get(i).stringValue().equals("fseq")) {
 
 								handler.updateTriggerZone(id, pointsInsideBox, pointsperPerson,
-										(long)(message.get(++i).intValue()));
+										(long) (message.get(++i).intValue()));
 							}
 						}
 					}
diff --git a/src/persons/TriggerBox.java b/src/persons/TriggerBox.java
index f7126ad..8852e23 100644
--- a/src/persons/TriggerBox.java
+++ b/src/persons/TriggerBox.java
@@ -11,7 +11,7 @@ public class TriggerBox {
 	private int depthPointsInBox;
 
 	// <PersonID, Points of that Person>
-	private HashMap<Integer, Integer> pointsPerPerson;
+	private HashMap<String, Integer> pointsPerPerson;
 
 	/**
 	 * Constructs a new TriggerBox
@@ -33,7 +33,7 @@ public class TriggerBox {
 	 * @param color
 	 *            color of Box
 	 */
-	public TriggerBox(String id, int depthPoints, HashMap<Integer, Integer> pointsPerPerson) {
+	public TriggerBox(String id, int depthPoints, HashMap<String, Integer> pointsPerPerson) {
 
 		this.id = id;
 		this.depthPointsInBox = depthPoints;
@@ -46,7 +46,7 @@ public void setID(String id) {
 		this.id = id;
 	}
 
-	public void setPointsPerPerson(HashMap<Integer, Integer> depthPointsPerPerson) {
+	public void setPointsPerPerson(HashMap<String, Integer> depthPointsPerPerson) {
 
 		this.pointsPerPerson = depthPointsPerPerson;
 	}
@@ -65,7 +65,7 @@ public int getPointsInsideBox() {
 		return depthPointsInBox;
 	}
 
-	public HashMap<Integer, Integer> getPointsPerPerson() {
+	public HashMap<String, Integer> getPointsPerPerson() {
 		return pointsPerPerson;
 	}