diff --git a/source/frontends/libretro/game.cpp b/source/frontends/libretro/game.cpp
index 998dc10c..a1c59264 100644
--- a/source/frontends/libretro/game.cpp
+++ b/source/frontends/libretro/game.cpp
@@ -117,8 +117,7 @@ namespace ra2
       const DWORD executedCycles = CpuExecute(cyclesToExecute, bVideoUpdate);
 
       g_dwCyclesThisFrame = (g_dwCyclesThisFrame + executedCycles) % dwClksPerFrame;
-      GetCardMgr().GetDisk2CardMgr().UpdateDriveState(executedCycles);
-      MB_PeriodicUpdate(executedCycles);
+      GetCardMgr().Update(executedCycles);
       SpkrUpdate(executedCycles);
     }
   }
diff --git a/source/frontends/ncurses/main.cpp b/source/frontends/ncurses/main.cpp
index 1bbf619d..56e078e1 100644
--- a/source/frontends/ncurses/main.cpp
+++ b/source/frontends/ncurses/main.cpp
@@ -51,7 +51,7 @@ namespace
 
     CardManager & cardManager = GetCardMgr();
 
-    cardManager.GetDisk2CardMgr().UpdateDriveState(uActualCyclesExecuted);
+    cardManager.Update(uActualCyclesExecuted);
 
     const int key = ProcessKeyboard(frame);
 
diff --git a/source/frontends/qt/qapple.cpp b/source/frontends/qt/qapple.cpp
index 2700a847..557e00ac 100644
--- a/source/frontends/qt/qapple.cpp
+++ b/source/frontends/qt/qapple.cpp
@@ -290,8 +290,7 @@ void QApple::on_timer()
     {
         const DWORD uActualCyclesExecuted = CpuExecute(uCyclesToExecute, bVideoUpdate);
         g_dwCyclesThisFrame += uActualCyclesExecuted;
-        cardManager.GetDisk2CardMgr().UpdateDriveState(uActualCyclesExecuted);
-        MB_PeriodicUpdate(uActualCyclesExecuted);
+        cardManager.Update(uActualCyclesExecuted);
         SpkrUpdate(uActualCyclesExecuted);
 
         // in case we run more than 1 frame
diff --git a/source/frontends/sdl/sdlframe.cpp b/source/frontends/sdl/sdlframe.cpp
index 621cb48a..376a81ae 100644
--- a/source/frontends/sdl/sdlframe.cpp
+++ b/source/frontends/sdl/sdlframe.cpp
@@ -580,8 +580,7 @@ namespace sa2
       const DWORD executedCycles = CpuExecute(thisCyclesToExecute, bVideoUpdate);
       totalCyclesExecuted += executedCycles;
 
-      GetCardMgr().GetDisk2CardMgr().UpdateDriveState(executedCycles);
-      MB_PeriodicUpdate(executedCycles);
+      GetCardMgr().Update(executedCycles);
       SpkrUpdate(executedCycles);
 
       g_dwCyclesThisFrame += executedCycles;
diff --git a/source/linux/benchmark.cpp b/source/linux/benchmark.cpp
index 56a2a5a7..41f37784 100644
--- a/source/linux/benchmark.cpp
+++ b/source/linux/benchmark.cpp
@@ -140,7 +140,7 @@ void VideoBenchmark(std::function<void()> redraw, std::function<void()> refresh)
     const DWORD executedcycles = CpuExecute(cyclesPerMs, true);
     cyclesThisFrame += executedcycles;
     // every ms disk and joystick are updated
-    GetCardMgr().GetDisk2CardMgr().UpdateDriveState(executedcycles);
+    GetCardMgr().GetDisk2CardMgr().Update(executedcycles);
 #if 0
     JoyUpdateButtonLatch(executedcycles);
 #endif