diff --git a/assets/sounds/death/emmi1.ogg b/assets/sounds/death/emmi1.ogg
new file mode 100644
index 0000000..18f6b58
Binary files /dev/null and b/assets/sounds/death/emmi1.ogg differ
diff --git a/assets/sounds/death/emmi10.ogg b/assets/sounds/death/emmi10.ogg
new file mode 100644
index 0000000..364428e
Binary files /dev/null and b/assets/sounds/death/emmi10.ogg differ
diff --git a/assets/sounds/death/emmi11.ogg b/assets/sounds/death/emmi11.ogg
new file mode 100644
index 0000000..1ea52b3
Binary files /dev/null and b/assets/sounds/death/emmi11.ogg differ
diff --git a/assets/sounds/death/emmi12.ogg b/assets/sounds/death/emmi12.ogg
new file mode 100644
index 0000000..6ab82a2
Binary files /dev/null and b/assets/sounds/death/emmi12.ogg differ
diff --git a/assets/sounds/death/emmi13.ogg b/assets/sounds/death/emmi13.ogg
new file mode 100644
index 0000000..ea1874c
Binary files /dev/null and b/assets/sounds/death/emmi13.ogg differ
diff --git a/assets/sounds/death/emmi14.ogg b/assets/sounds/death/emmi14.ogg
new file mode 100644
index 0000000..86c88cc
Binary files /dev/null and b/assets/sounds/death/emmi14.ogg differ
diff --git a/assets/sounds/death/emmi15.ogg b/assets/sounds/death/emmi15.ogg
new file mode 100644
index 0000000..5392bbc
Binary files /dev/null and b/assets/sounds/death/emmi15.ogg differ
diff --git a/assets/sounds/death/emmi16.ogg b/assets/sounds/death/emmi16.ogg
new file mode 100644
index 0000000..d87ce96
Binary files /dev/null and b/assets/sounds/death/emmi16.ogg differ
diff --git a/assets/sounds/death/emmi17.ogg b/assets/sounds/death/emmi17.ogg
new file mode 100644
index 0000000..faef26a
Binary files /dev/null and b/assets/sounds/death/emmi17.ogg differ
diff --git a/assets/sounds/death/emmi18.ogg b/assets/sounds/death/emmi18.ogg
new file mode 100644
index 0000000..9929072
Binary files /dev/null and b/assets/sounds/death/emmi18.ogg differ
diff --git a/assets/sounds/death/emmi19.ogg b/assets/sounds/death/emmi19.ogg
new file mode 100644
index 0000000..9414873
Binary files /dev/null and b/assets/sounds/death/emmi19.ogg differ
diff --git a/assets/sounds/death/emmi2.ogg b/assets/sounds/death/emmi2.ogg
new file mode 100644
index 0000000..026a0aa
Binary files /dev/null and b/assets/sounds/death/emmi2.ogg differ
diff --git a/assets/sounds/death/emmi20.ogg b/assets/sounds/death/emmi20.ogg
new file mode 100644
index 0000000..7cfc81a
Binary files /dev/null and b/assets/sounds/death/emmi20.ogg differ
diff --git a/assets/sounds/death/emmi21.ogg b/assets/sounds/death/emmi21.ogg
new file mode 100644
index 0000000..f914d59
Binary files /dev/null and b/assets/sounds/death/emmi21.ogg differ
diff --git a/assets/sounds/death/emmi3.ogg b/assets/sounds/death/emmi3.ogg
new file mode 100644
index 0000000..edb8770
Binary files /dev/null and b/assets/sounds/death/emmi3.ogg differ
diff --git a/assets/sounds/death/emmi4.ogg b/assets/sounds/death/emmi4.ogg
new file mode 100644
index 0000000..a4d06c1
Binary files /dev/null and b/assets/sounds/death/emmi4.ogg differ
diff --git a/assets/sounds/death/emmi5.ogg b/assets/sounds/death/emmi5.ogg
new file mode 100644
index 0000000..99ce97a
Binary files /dev/null and b/assets/sounds/death/emmi5.ogg differ
diff --git a/assets/sounds/death/emmi6.ogg b/assets/sounds/death/emmi6.ogg
new file mode 100644
index 0000000..000553a
Binary files /dev/null and b/assets/sounds/death/emmi6.ogg differ
diff --git a/assets/sounds/death/emmi7.ogg b/assets/sounds/death/emmi7.ogg
new file mode 100644
index 0000000..f7f5674
Binary files /dev/null and b/assets/sounds/death/emmi7.ogg differ
diff --git a/assets/sounds/death/emmi8.ogg b/assets/sounds/death/emmi8.ogg
new file mode 100644
index 0000000..9ad5298
Binary files /dev/null and b/assets/sounds/death/emmi8.ogg differ
diff --git a/assets/sounds/death/emmi9.ogg b/assets/sounds/death/emmi9.ogg
new file mode 100644
index 0000000..de5ca5d
Binary files /dev/null and b/assets/sounds/death/emmi9.ogg differ
diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
index 2db5411..c4171c4 100644
--- a/source/GameOverSubstate.hx
+++ b/source/GameOverSubstate.hx
@@ -81,7 +81,10 @@ class GameOverSubstate extends MusicBeatSubstate
 
 		if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished)
 		{
-			FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix));
+			if (PlayState.SONG.song.toLowerCase() == 'glamour'){
+				FlxG.sound.play(Paths.sound("death/emmi" + FlxG.random.int(1, 21)));
+			}
+			FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix), 0.6);
 		}
 
 		if (FlxG.sound.music.playing)
diff --git a/source/PlayState.hx b/source/PlayState.hx
index b344988..ab22925 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -336,11 +336,9 @@ class PlayState extends MusicBeatState
 		var gfVersion:String = 'gf';
 
 		if (SONG.gf == null) {
-			switch(storyWeek)
+			switch(SONG.song.toLowerCase())
 			{
-				case 4: gfVersion = 'gf-car';
-				case 5: gfVersion = 'gf-christmas';
-				case 6: gfVersion = 'gf-pixel';
+				case "glamour": gfVersion = 'gf-cola';
 			}
 
 			SONG.gf = gfVersion;