diff --git a/assets/0001WaitingForGameStart.mp3 b/assets/0001WaitingForGameStart.mp3
index 770243b..7496557 100644
--- a/assets/0001WaitingForGameStart.mp3
+++ b/assets/0001WaitingForGameStart.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec88a517b806134f631356e8d1fdee31f1bb7680d9a444d799376e00268228ef
-size 160913
+oid sha256:21bf168a9f7630f5c48687a15fbd3d6bdd303b5dabecaea76ac2e994f8839fef
+size 889344
diff --git a/assets/0002AfterMainstation.mp3 b/assets/0002AfterMainstation.mp3
new file mode 100644
index 0000000..e81d240
--- /dev/null
+++ b/assets/0002AfterMainstation.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63371bb5c9d3b2a91588a31de26049c365c737e1561d5a6ea93b20b173bf18ba
+size 797184
diff --git a/assets/0002OnTheMoveMainStation.mp3 b/assets/0002OnTheMoveMainStation.mp3
deleted file mode 100644
index a031088..0000000
--- a/assets/0002OnTheMoveMainStation.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77f0d5058b2cec382951dd88e4d1cb34b62f083bcb0ac466895d93a34b47152a
-size 788688
diff --git a/assets/0003HackingStationMuhvella.mp3 b/assets/0003HackingStationMuhvella.mp3
new file mode 100644
index 0000000..e9f1861
--- /dev/null
+++ b/assets/0003HackingStationMuhvella.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5fc464f5809f594a3b9ab8994017de1dbc8b99c5ec78f59a253641f3454e5f0
+size 401280
diff --git a/assets/0003StationOneCorrect.mp3 b/assets/0003StationOneCorrect.mp3
deleted file mode 100644
index 74cf115..0000000
--- a/assets/0003StationOneCorrect.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:412db447abde936505799b6b1db4b382712c890ee333a8d52b8568fd844d818e
-size 496952
diff --git a/assets/0004PickupStationMuhvella.mp3 b/assets/0004PickupStationMuhvella.mp3
new file mode 100644
index 0000000..5c37542
--- /dev/null
+++ b/assets/0004PickupStationMuhvella.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d85ce2880b0d24df851080426b124527896803acf5143e9ba4c1a5e16243ec3
+size 277248
diff --git a/assets/0004StationTwoCorrekt.mp3 b/assets/0004StationTwoCorrekt.mp3
deleted file mode 100644
index 4924619..0000000
--- a/assets/0004StationTwoCorrekt.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0876d584bd52ff56d25fe38ff8fc33e90c2a10bd56f3879bc503954554e8802f
-size 529135
diff --git a/assets/0005AfterStationMuhvella.mp3 b/assets/0005AfterStationMuhvella.mp3
new file mode 100644
index 0000000..4ccf604
--- /dev/null
+++ b/assets/0005AfterStationMuhvella.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:624d43f1a8a05041684cdd9fa3dbf8a23e8775ee57eed7f69ed995ec05cb3beb
+size 445440
diff --git a/assets/0005StationTreeCorrekt.mp3 b/assets/0005StationTreeCorrekt.mp3
deleted file mode 100644
index c765810..0000000
--- a/assets/0005StationTreeCorrekt.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02f59fbe2074954153b434e0d5ee7ed9ccf1a04e38aa138f7d7e036b28b87b4a
-size 577200
diff --git a/assets/0006HackingStationMagie.mp3 b/assets/0006HackingStationMagie.mp3
new file mode 100644
index 0000000..53138cf
--- /dev/null
+++ b/assets/0006HackingStationMagie.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4521f8ca1193c391a097baecc27038241d351ab671ae53f62db697bcd4dcec48
+size 469248
diff --git a/assets/0006StationFourCorrekt.mp3 b/assets/0006StationFourCorrekt.mp3
deleted file mode 100644
index 3352851..0000000
--- a/assets/0006StationFourCorrekt.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f976b55be7544fd935cbd6641814b6ad68d159f0196d1beb5c325f8398000eb9
-size 560900
diff --git a/assets/0007PickupStationMagie.mp3 b/assets/0007PickupStationMagie.mp3
new file mode 100644
index 0000000..0ac1a7e
--- /dev/null
+++ b/assets/0007PickupStationMagie.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:afa71a30311abaf5b82aa57a1ed6af889fb5c044e16f2848e9a134c94f29811b
+size 477312
diff --git a/assets/0007WrongStation.mp3 b/assets/0007WrongStation.mp3
deleted file mode 100644
index 8a9302a..0000000
--- a/assets/0007WrongStation.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db9a11bf61e119fa54e2c1076c927a9f5e7ae8456bccbc218f93b6f9e977f40f
-size 112848
diff --git a/assets/0008AfterSationMagie.mp3 b/assets/0008AfterSationMagie.mp3
new file mode 100644
index 0000000..10b4b1a
--- /dev/null
+++ b/assets/0008AfterSationMagie.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b5c44ebde9933b5be6ab494ac80708a681902cd4dcf3f9de7eaf8645e64c44a
+size 425472
diff --git a/assets/0008Ende.mp3 b/assets/0008Ende.mp3
deleted file mode 100644
index 7189145..0000000
--- a/assets/0008Ende.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72ae1487606e80e17c1feaf3d658bda123fd5899ecc093cd7b1f76c2a30395a9
-size 433004
diff --git a/assets/0009HackingStationBicola.mp3 b/assets/0009HackingStationBicola.mp3
new file mode 100644
index 0000000..601b40e
--- /dev/null
+++ b/assets/0009HackingStationBicola.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af7c1d630d6949c577cfeffccb91169080da5be83328e116b4d7a61700094c76
+size 588480
diff --git a/assets/0009Stress.mp3 b/assets/0009Stress.mp3
deleted file mode 100644
index be66a66..0000000
--- a/assets/0009Stress.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b397a70389e33a600499e5099f877aae097efee606fb5c4d20a26d99deac2e3c
-size 177213
diff --git a/assets/0010PickupStationBicola.mp3 b/assets/0010PickupStationBicola.mp3
new file mode 100644
index 0000000..8428882
--- /dev/null
+++ b/assets/0010PickupStationBicola.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3544ff936304b0e53af972d146c7cb9e9f8b77c992f0fe5ccb5d2c463e78bb88
+size 1271520
diff --git a/assets/0010StationTwoPickUp-240528_1353.mp3 b/assets/0010StationTwoPickUp-240528_1353.mp3
deleted file mode 100644
index 193d8db..0000000
--- a/assets/0010StationTwoPickUp-240528_1353.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ce4b76e0861a9b09d0c0eb91887c57d725f00f7679077eab78307b4b00dc8d7
-size 114101
diff --git a/assets/0011AfterStationBicola.mp3 b/assets/0011AfterStationBicola.mp3
new file mode 100644
index 0000000..323a23a
--- /dev/null
+++ b/assets/0011AfterStationBicola.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f71d507d83a59ac45bee44b5e8849507c80136edec61724770d7936f308cd8e2
+size 511680
diff --git a/assets/0011StationTreePickup-240528_1354.mp3 b/assets/0011StationTreePickup-240528_1354.mp3
deleted file mode 100644
index 9673539..0000000
--- a/assets/0011StationTreePickup-240528_1354.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5715202057ba2064c689c4aece267dc05dbb779c4646ac59a4bbfd7814ebaa4c
-size 168854
diff --git a/assets/0012HackingStationTobione.mp3 b/assets/0012HackingStationTobione.mp3
new file mode 100644
index 0000000..422720e
--- /dev/null
+++ b/assets/0012HackingStationTobione.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0974c1d83bf05487c95360542ab9573713397c0d7bc83adfbf1efd055df3819a
+size 791520
diff --git a/assets/0012StationFourPickUp-240528_1357.mp3 b/assets/0012StationFourPickUp-240528_1357.mp3
deleted file mode 100644
index 6db8374..0000000
--- a/assets/0012StationFourPickUp-240528_1357.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:531ff46ad49986287d2a460b283d225cf0514b2318202af6ffe175e939867559
-size 152972
diff --git a/assets/0013PickupStationTobione.mp3 b/assets/0013PickupStationTobione.mp3
new file mode 100644
index 0000000..f299b45
--- /dev/null
+++ b/assets/0013PickupStationTobione.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25b07721ba9e5f27ba728a1f7f05075af1ff95ed315345a4a3d0b61f60f102fb
+size 1421760
diff --git a/assets/0014AfterTobione.mp3 b/assets/0014AfterTobione.mp3
new file mode 100644
index 0000000..1358d34
--- /dev/null
+++ b/assets/0014AfterTobione.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:278d81deba822df2df47b773c7a01529beae7ebb492df8dbc1eb9a24ecfb92d3
+size 441600
diff --git a/assets/0015End.mp3 b/assets/0015End.mp3
new file mode 100644
index 0000000..11dedcd
--- /dev/null
+++ b/assets/0015End.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1db9be7221cb13fe7451b854b9853c18fc001c93ac463db08a1585dcb3da8f4
+size 741600
diff --git a/assets/0016WrongStation.mp3 b/assets/0016WrongStation.mp3
new file mode 100644
index 0000000..fbcc67a
--- /dev/null
+++ b/assets/0016WrongStation.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8b3f3890eec7ce0a9e2984e9fc205e4d5daa62953a00d7fe719227e8cb81ae4
+size 772805
diff --git a/src/sounds.h b/src/sounds.h
index 8c1c6aa..8bdda9b 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -5,22 +5,20 @@
 #define AFTER_MAIN_STATION 2
 
 #define HACKING_STATION_MUHVELLA 3
-#define PICKUP_STATION_MUHVELLA 10
-#define AFTER_MUHVELLA 10 // incorrect
+#define PICKUP_STATION_MUHVELLA 4
+#define AFTER_MUHVELLA 5
 
-#define HACKING_STATION_MAGIE 4
-#define PICKUP_STATION_MAGIE 11
-#define AFTER_MAGIE 11 // incorrect
+#define HACKING_STATION_MAGIE 6
+#define PICKUP_STATION_MAGIE 7
+#define AFTER_MAGIE 8
 
-#define HACKING_STATION_BICOLA 5
-#define PICKUP_STATION_BICOLA 12
-#define AFTER_BICOLA 12 // incorrect
+#define HACKING_STATION_BICOLA 9
+#define PICKUP_STATION_BICOLA 10
+#define AFTER_BICOLA 11
 
-#define HACKING_STATION_TOBIONE 6
+#define HACKING_STATION_TOBIONE 12
 #define PICKUP_STATION_TOBIONE 13
-#define AFTER_TOBIONE 13 // incorrect
+#define AFTER_TOBIONE 14
 
-#define END 8
-#define WRONG_STATION 7
-
-#define STRESS 9
+#define END 15
+#define WRONG_STATION 16
diff --git a/src/states.cpp b/src/states.cpp
index ef9a478..db5f72a 100644
--- a/src/states.cpp
+++ b/src/states.cpp
@@ -184,22 +184,22 @@ void Hacking::activated(const Context context)
     auto currentStationIndex = context.getStationIndex(this->currentStation);
     if (currentStationIndex == 1)
     {
-        timer = Timer(31000, false);
+        timer = Timer(25000, false);
         context.dfPlayer->play(HACKING_STATION_MUHVELLA);
     }
     if (currentStationIndex == 2)
     {
-        timer = Timer(33000, false);
+        timer = Timer(29000, false);
         context.dfPlayer->play(HACKING_STATION_MAGIE);
     }
     if (currentStationIndex == 3)
     {
-        timer = Timer(36000, false);
+        timer = Timer(29000, false);
         context.dfPlayer->play(HACKING_STATION_BICOLA);
     }
     if (currentStationIndex == 4)
     {
-        timer = Timer(35000, false);
+        timer = Timer(39000, false);
         context.dfPlayer->play(HACKING_STATION_TOBIONE);
     }
     timer.start();
@@ -287,17 +287,23 @@ void WaitingForPickup::activated(Context context)
 //------------------------------------
 
 
-End::End() = default;
+End::End(): timer(Timer(0, false))
+{
+}
 
 State* End::pickedUp(const Context context)
 {
-    // todo what happens when we pick up here?...
-    return this;
+    // todo to be discussed if this is the expected outcome...
+    return new OnTheMove(context.stations + 1); // starting game early 
 }
 
 State* End::update(const Context context)
 {
-    // todo after some time return waiting for game start...
+    bool done = timer.update(context.delta);
+    if (done)
+    {
+        return new WaitingForGameStart();
+    }
     return this;
 }
 
@@ -309,4 +315,5 @@ String End::updateDisplay()
 void End::activated(const Context context)
 {
     context.dfPlayer->play(END);
+    timer = Timer(27000, false);
 }
diff --git a/src/states.h b/src/states.h
index f89b856..ac28ee1 100644
--- a/src/states.h
+++ b/src/states.h
@@ -97,6 +97,8 @@ public:
 
 class End final : public State
 {
+protected:
+    Timer timer;
 public:
     End();
     State* pickedUp(Context context) override;