diff --git a/osu-framework b/osu-framework
index ed33cc4899..beddb830a2 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit ed33cc48996e9b57093c4d057aa0560319495dee
+Subproject commit beddb830a23b40fe970892e4c84339871e202034
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index af6fa91661..d4a1976f17 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -75,7 +75,9 @@
       <Name>osu.Game.Resources</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Beatmaps\IO\OszArchiveReaderTest.cs" />
     <Compile Include="Beatmaps\IO\ImportBeatmapTest.cs" />
@@ -86,4 +88,4 @@
     <EmbeddedResource Include="Resources\Soleily - Renatus %28Gamu%29 [Insane].osu" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs
index d6b459b0d1..eb5e5bc094 100644
--- a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs
+++ b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Beatmaps.Objects
         {
             base.Update();
 
-            if (Time >= HitObject.EndTime && !counted)
+            if (Time.Current >= HitObject.EndTime && !counted)
             {
                 counted = true;
                 if (state == ArmedState.Armed)
diff --git a/osu.Game/GameModes/Menu/Button.cs b/osu.Game/GameModes/Menu/Button.cs
index 779501a448..012c000f9c 100644
--- a/osu.Game/GameModes/Menu/Button.cs
+++ b/osu.Game/GameModes/Menu/Button.cs
@@ -112,7 +112,7 @@ namespace osu.Game.GameModes.Menu
             icon.ScaleTo(1, 500, EasingTypes.OutElasticHalf);
 
             double offset = 0; //(1 - Game.Audio.SyncBeatProgress) * duration;
-            double startTime = Time + offset;
+            double startTime = Time.Current + offset;
 
             icon.RotateTo(10, offset, EasingTypes.InOutSine);
             icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out);
diff --git a/osu.Game/GameModes/Play/ComboCounter.cs b/osu.Game/GameModes/Play/ComboCounter.cs
index 8d5f55f775..06c45d7386 100644
--- a/osu.Game/GameModes/Play/ComboCounter.cs
+++ b/osu.Game/GameModes/Play/ComboCounter.cs
@@ -238,8 +238,8 @@ namespace osu.Game.GameModes.Play
                 return;
             }
 
-            transform.StartTime = Time;
-            transform.EndTime = Time + getProportionalDuration(currentValue, newValue);
+            transform.StartTime = Time.Current;
+            transform.EndTime = Time.Current + getProportionalDuration(currentValue, newValue);
             transform.StartValue = currentValue;
             transform.EndValue = newValue;
             transform.Easing = RollingEasing;
@@ -253,7 +253,7 @@ namespace osu.Game.GameModes.Play
             {
                 get
                 {
-                    double time = CurrentTime ?? 0;
+                    double time = Time?.Current ?? 0;
                     if (time < StartTime) return StartValue;
                     if (time >= EndTime) return EndValue;
 
diff --git a/osu.Game/GameModes/Play/ComboResultCounter.cs b/osu.Game/GameModes/Play/ComboResultCounter.cs
index fd96906d18..9607c6df14 100644
--- a/osu.Game/GameModes/Play/ComboResultCounter.cs
+++ b/osu.Game/GameModes/Play/ComboResultCounter.cs
@@ -45,7 +45,7 @@ namespace osu.Game.GameModes.Play
             {
                 get
                 {
-                    double time = CurrentTime ?? 0;
+                    double time = Time?.Current ?? 0;
                     if (time < StartTime) return StartValue;
                     if (time >= EndTime) return EndValue;
 
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 80f1b345b6..13737ded34 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -225,8 +225,8 @@ namespace osu.Game.Graphics.UserInterface
                     ? GetProportionalDuration(currentValue, newValue)
                     : RollingDuration;
 
-            transform.StartTime = Time;
-            transform.EndTime = Time + rollingTotalDuration;
+            transform.StartTime = Time.Current;
+            transform.EndTime = Time.Current + rollingTotalDuration;
             transform.StartValue = currentValue;
             transform.EndValue = newValue;
             transform.Easing = RollingEasing;
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 48f4da1fcf..56be64b92e 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Graphics.UserInterface
             {
                 get
                 {
-                    double time = CurrentTime ?? 0;
+                    double time = Time?.Current ?? 0;
                     if (time < StartTime) return StartValue;
                     if (time >= EndTime) return EndValue;
 
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index cff8fc65fe..e56e699be9 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             get
             {
-                double elapsedTime = Time - transformStartTime;
+                double elapsedTime = Time.Current - transformStartTime;
                 double expectedElapsedTime = Math.Abs(prevCount - count) * animationDelay;
                 if (elapsedTime >= expectedElapsedTime)
                     return count;
@@ -149,7 +149,7 @@ namespace osu.Game.Graphics.UserInterface
         public void StopAnimation()
         {
             prevCount = count;
-            transformStartTime = Time;
+            transformStartTime = Time.Current;
 
             for (int i = 0; i < MaxStars; i++)
                 transformStarQuick(i, count);
@@ -188,7 +188,7 @@ namespace osu.Game.Graphics.UserInterface
                 transformStar(i, newValue);
                 stars[i].DelayReset();
             }
-            transformStartTime = Time;
+            transformStartTime = Time.Current;
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
index 4d86483262..0acd330b0e 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
@@ -67,21 +67,12 @@ namespace osu.Game.Graphics.UserInterface.Volume
             base.Dispose(isDisposing);
         }
 
-        protected override bool OnWheelDown(InputState state)
+        protected override bool OnWheel(InputState state)
         {
             if (!IsVisible)
                 return false;
 
-            volumeMeterMaster.TriggerWheelDown(state);
-            return true;
-        }
-
-        protected override bool OnWheelUp(InputState state)
-        {
-            if (!IsVisible)
-                return false;
-
-            volumeMeterMaster.TriggerWheelUp(state);
+            volumeMeterMaster.TriggerWheel(state);
             return true;
         }
 
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
index 1601c2a883..1c98aaa61d 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
@@ -14,13 +14,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
     {
         public Action ActivateRequested;
 
-        protected override bool OnWheelDown(InputState state)
-        {
-            ActivateRequested?.Invoke();
-            return true;
-        }
-
-        protected override bool OnWheelUp(InputState state)
+        protected override bool OnWheel(InputState state)
         {
             ActivateRequested?.Invoke();
             return true;
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
index 64cb59175c..c72ddeede3 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
@@ -73,15 +73,9 @@ namespace osu.Game.Graphics.UserInterface.Volume
             }
         }
 
-        protected override bool OnWheelUp(InputState state)
+        protected override bool OnWheel(InputState state)
         {
-            Volume += 0.05f;
-            return true;
-        }
-
-        protected override bool OnWheelDown(InputState state)
-        {
-            Volume -= 0.05f;
+            Volume += 0.05f * state.Mouse.WheelDiff;
             return true;
         }