diff --git a/src/cvars.cpp b/src/cvars.cpp
index 8315d9fd7..2b30a208d 100644
--- a/src/cvars.cpp
+++ b/src/cvars.cpp
@@ -800,6 +800,7 @@ consvar_t cv_battleufotest = OnlineCheat("battleufotest", "Off").on_off().descri
 
 #ifdef DEVELOP
 	consvar_t cv_botcontrol = OnlineCheat("botcontrol", "On").on_off().description("Toggle bot AI movement");
+	consvar_t cv_takeover = OnlineCheat("takeover", "Off").on_off().description("Human players use bot movement");
 #endif
 
 extern CV_PossibleValue_t capsuletest_cons_t[];
diff --git a/src/k_bot.cpp b/src/k_bot.cpp
index d9d91a134..f553d4856 100644
--- a/src/k_bot.cpp
+++ b/src/k_bot.cpp
@@ -432,6 +432,11 @@ boolean K_PlayerUsesBotMovement(const player_t *player)
 	if (player->bot)
 		return true;
 
+#ifdef DEVELOP
+	if (cv_takeover.value)
+		return true;
+#endif
+
 	return false;
 }
 
diff --git a/src/k_bot.h b/src/k_bot.h
index 8a4cfe893..6044bbd92 100644
--- a/src/k_bot.h
+++ b/src/k_bot.h
@@ -24,6 +24,7 @@ extern "C" {
 
 #ifdef DEVELOP
 	extern consvar_t cv_botcontrol;
+	extern consvar_t cv_takeover;
 #endif
 
 // Maximum value of botvars.difficulty
diff --git a/src/k_race.c b/src/k_race.c
index e85883ac9..cbdc28e77 100644
--- a/src/k_race.c
+++ b/src/k_race.c
@@ -475,10 +475,6 @@ void K_SpawnFinishEXP(player_t *player, UINT16 exp)
 	{
 		mobj_t *p1 = P_SpawnMobj(finishBeamLine->v1->x, finishBeamLine->v1->y, player->mo->z, MT_THOK);
 		mobj_t *p2 = P_SpawnMobj(finishBeamLine->v2->x, finishBeamLine->v2->y, player->mo->z, MT_THOK);
-		p1->fuse = 200;
-		p2->fuse = 200;
-		p1->tics = 200;
-		p2->tics = 200;
 		K_SpawnEXP(player, exp, p1);
 		K_SpawnEXP(player, exp, p2);
 	}
diff --git a/src/objects/exp.c b/src/objects/exp.c
index 776993401..d7409b381 100644
--- a/src/objects/exp.c
+++ b/src/objects/exp.c
@@ -56,6 +56,9 @@ void Obj_ExpThink (mobj_t *exp)
 
         dist = P_AproxDistance(P_AproxDistance(exp->x - mo->x, exp->y - mo->y), exp->z - mo->z);
 
+        exp->renderflags |= RF_DONTDRAW;
+        exp->renderflags &= ~K_GetPlayerDontDrawFlag(player);
+
         // K_MatchGenericExtraFlags(exp, mo);
 
         exp->cusval++;