diff --git a/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua b/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua
index d65bb30..8bd5d91 100644
--- a/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua
+++ b/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua
@@ -44,7 +44,7 @@ function ENT:StartTouch(ent)
 		ent:SetNW2Int("CPNum", ent:GetNW2Int("CPNum", 1) + 1)
 
 		if ent:GetNW2Int("CPNum", 1) > table.Count(Checkpoints) then
-			-- ReplayStop(ent)
+			ReplayStop(ent)
 			FinishCourse(ent)
 		else
 			ent.CPSavePos = ent:GetPos()
diff --git a/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua b/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua
index d29f6b4..cd82fed 100644
--- a/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua
@@ -211,8 +211,8 @@ function PLAYER:Spawn()
 				ply:SetPos(Course_StartPos)
 			end)
 
-			-- ReplayStop(ply)
-			-- ReplayStart(ply)
+			ReplayStop(ply)
+			ReplayStart(ply)
 		end
 	end
 
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua
index d0f993d..00c9693 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua
@@ -129,7 +129,7 @@ if CLIENT then
 
 			LocalPlayer():EmitSound("A_TT_Finish_Positive.wav")
 			SaveCheckpointTime()
-			-- SaveReplayData()
+			SaveReplayData()
 		else
 			timetext = "+" .. string.FormattedTime(math.abs(timestr), "%02i:%02i:%02i")
 			timecolor = color_negative
@@ -308,23 +308,19 @@ function LoadCheckpointTime()
 	return times or nil
 end
 
--- function SaveReplayData()
--- 	local replay = util.Compress(util.TableToJSON(LocalPlayer().ReplayTicks))
--- 	local dir = "beatrun/replays/" .. game.GetMap() .. "/"
-
--- 	if not replay then return end
-
--- 	file.CreateDir(dir)
--- 	file.Write(dir .. Course_ID .. ".txt", replay)
--- end
-
--- function LoadReplayData()
--- 	local dir = "beatrun/replays/" .. game.GetMap() .. "/"
--- 	local replay = file.Read(dir .. Course_ID .. ".txt")
--- 	replay = replay and util.JSONToTable(util.Decompress(replay))
-
--- 	return replay or nil
--- end
+function SaveReplayData()
+	local replay = util.Compress(util.TableToJSON(LocalPlayer().ReplayTicks))
+	local dir = "beatrun/replays/" .. game.GetMap() .. "/"
+	if not replay then return end
+	file.CreateDir(dir)
+	file.Write(dir .. Course_ID .. ".txt", replay)
+end
+function LoadReplayData()
+	local dir = "beatrun/replays/" .. game.GetMap() .. "/"
+	local replay = file.Read(dir .. Course_ID .. ".txt")
+	replay = replay and util.JSONToTable(util.Decompress(replay))
+	return replay or nil
+end
 
 function StartCourse(spawntime)
 	local faststartmult = LocalPlayer():GetInfoNum("Beatrun_FastStart", 0) > 0 and 0.5 or 1