diff --git a/Assets/WhistleIntro.ogg b/Assets/WhistleIntro.ogg
new file mode 100644
index 0000000..31b20ae
--- /dev/null
+++ b/Assets/WhistleIntro.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:177b4aacadcf6bcdfcb65596d58a5ed6dbc1effefd8e104860ff2fb38628203d
+size 676518
diff --git a/Assets/WhistleLoop.ogg b/Assets/WhistleLoop.ogg
new file mode 100644
index 0000000..f3344e8
--- /dev/null
+++ b/Assets/WhistleLoop.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69a2afa107a35e735e4ebae3c48871f558b68dbcd219bb52ed53bad0dadd2c09
+size 398751
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5288c2..2aedb9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Shortened intro of track Peretasovka to match vanilla timings.
 - Added multiple intro variants for BeefLiver.
 - Added a new track BbIXODaHET.
+- Added a new track Whistle. Now it can fully replace WhistleJester!
 
 ## MuzikaGromche 1337.420.9004 - Life Support Edition
 
diff --git a/MuzikaGromche/Plugin.cs b/MuzikaGromche/Plugin.cs
index aa41496..30da7e8 100644
--- a/MuzikaGromche/Plugin.cs
+++ b/MuzikaGromche/Plugin.cs
@@ -711,6 +711,54 @@ namespace MuzikaGromche
                     [-1, 2, 7, 31],
                     [0, 0.4f, 0, 0]),
             },
+            new SelectableAudioTrack
+            {
+                Name = "Whistle",
+                AudioType = AudioType.OGGVORBIS,
+                Language = Language.ENGLISH,
+                WindUpTimer = 41.27f,
+                Bars = 12,
+                BeatsOffset = 0.0f,
+                ColorTransitionIn = 0.5f,
+                ColorTransitionOut = 0.2f,
+                ColorTransitionEasing = Easing.OutExpo,
+                Palette = Palette.Parse([
+                    "#8DDEDD", "#98DE28", "#E8DB4B", "#F060A8", "#EEC263", "#725DEB",
+                ]),
+                LoopOffset = 16,
+                FadeOutBeat = -22,
+                FadeOutDuration = 6,
+                FlickerLightsTimeSeries = [-20, 12],
+                Lyrics = [
+                    (-40, "Can you blow my whistle, baby, whistle, baby?"),
+                    (-36, "Can you blow my whistle, baby, whistle, baby? Let me know"),
+                    (-33.5f, "Girl, I'm gonna show you how to\ndo it"),
+                    (-30.5f, "Girl, I'm gonna show you how to\ndo it and we start real slow"),
+                    (-27, "You just put your lips together"),
+                    (-24, "You just put your lips together and you come real close"),
+                    (-21, "Can you blow my whistle, baby, whistle, baby?"),
+
+                    (-17, "HERE WE GO"),
+
+                    (10, "Yeah, baby, make that whistle"),
+                    (12, "Yeah, baby, make that whistle\nblow oh oh oh"),
+
+                    (15, "Can you blow my whistle, baby, whistle, baby?"),
+                    (20, "Can you blow my whistle, baby, whistle, baby? Let me know"),
+                    (23, "Girl, I'm gonna show you how to\ndo it"),
+                    (28, "Girl, I'm gonna show you how to\ndo it and we start real slow"),
+                    (32, "You just put your lips together"),
+                    (36, "You just put your lips together and you come real close"),
+                    (39, "Can you blow my whistle, baby, whistle, baby?"),
+
+                    (46, "HERE"),
+                    (47, "Here WE"),
+                    (48, "Here we GO"),
+                ],
+                DrunknessLoopOffsetTimeSeries = new(
+                    [-16f, -15.25f, -12f, 9f, 15f, 16f, 18f, 21f],
+                    [0f, 0.7f, 0f, 0f, 0.4f, 0.7f, 0.4f, 0f]),
+            },
         ];
 
         public static ISelectableTrack ChooseTrack()