diff --git a/New Text Document.txt b/New Text Document.txt
index 502a420..62136e4 100644
--- a/New Text Document.txt	
+++ b/New Text Document.txt	
@@ -1 +1 @@
-next: 17696
\ No newline at end of file
+next: 17712
\ No newline at end of file
diff --git a/data/movements/movements.xml b/data/movements/movements.xml
index 07ab4bc..6f254bc 100644
--- a/data/movements/movements.xml
+++ b/data/movements/movements.xml
@@ -680,6 +680,8 @@
 	<movevent event="AddItem" movementid="17705" tileitem="1" script="misc/thais_trainers.lua" />
 	<movevent event="StepIn" movementid="17706" script="misc/thais_trainers_back.lua" />
 	<movevent event="AddItem" movementid="17706" tileitem="1" script="misc/thais_trainers_back.lua" />
+	<movevent event="StepIn" movementid="17708" script="misc/step_trainers.lua" />
+	
 	<!--Doors -->
 	<movevent event="StepOut" itemid="1643" script="misc/doors.lua" />
 	<movevent event="StepOut" itemid="1647" script="misc/doors.lua" />
diff --git a/data/movements/scripts/misc/step_trainers.lua b/data/movements/scripts/misc/step_trainers.lua
new file mode 100644
index 0000000..ec6c0ca
--- /dev/null
+++ b/data/movements/scripts/misc/step_trainers.lua
@@ -0,0 +1,70 @@
+local trainingRoomExit = {x = 32231, y = 32200, z = 7}
+
+function checkTrainingTile(playerId, pos, movementId)
+	local player = Player(playerId)
+	if not player then
+		return true
+	end
+   
+	if getTopCreature(pos).uid ~= playerId then
+		return true
+	end
+   
+	if player:getStorageValue(17709) >= 10800000 then
+		player:teleportTo(trainingRoomExit)
+		Position(pos):sendMagicEffect(CONST_ME_TELEPORT)
+		player:sendTextMessage(MESSAGE_INFO_DESCR, "Your training time have expired. Come back tomorrow.")
+		Position(player:getPosition()):sendMagicEffect(CONST_ME_TELEPORT)
+		return true
+	end
+   
+	local trainingTime = player:getStorageValue(17709)
+	player:setStorageValue(17709, trainingTime + 60000)
+	player:sendTextMessage(MESSAGE_STATUS_SMALL, "You have " .. math.modf((10800000 - trainingTime) / 1000 / 60) .. " minutes of remaining training time in the Thais training chamber.")
+	addEvent(checkTrainingTile, 60000, playerId, pos, movementId)
+	return true
+end
+
+function onStepIn(creature, item, position, fromPosition)
+	local player = creature:getPlayer()
+	if not player then
+		return true
+	end
+	
+	local dayOfYear = tonumber(os.date("%j"))
+
+	-- Reset counting storage value if it does not match the last time saved day
+	if player:getStorageValue(17711) ~= dayOfYear then
+		player:setStorageValue(17709, 0)
+	end
+	
+	if player:getStorageValue(17711) == dayOfYear and player:getStorageValue(17709) >= 10800000 then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You are not allowed to train today anymore. Come back tomorrow.")
+		if position == fromPosition then
+			player:teleportTo(trainingRoomExit)
+		else
+			player:teleportTo(fromPosition)
+		end
+		return true
+	end
+	
+	if player:getStorageValue(17710) > os.time() then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have 1 minute training monk chamber step in timeout.")
+		if position == fromPosition then
+			player:teleportTo(trainingRoomExit)
+		else
+			player:teleportTo(fromPosition)
+		end
+		return true
+	end
+	
+	local playerId = player:getId()
+	local pos = player:getPosition()
+	
+	local trainingTime = player:getStorageValue(17709)
+	player:setStorageValue(17709, trainingTime + 60000)
+	player:sendTextMessage(MESSAGE_STATUS_SMALL, "You have " .. math.modf((10800000 - trainingTime) / 1000 / 60) .. " minutes of remaining training time in the Thais training chamber.")
+	player:setStorageValue(17710, os.time() + 1 * 60)
+	player:setStorageValue(17711, dayOfYear)
+	addEvent(checkTrainingTile, 60000, playerId, pos, item:getMovementId())
+end
\ No newline at end of file
diff --git a/data/world792/map.otbm b/data/world792/map.otbm
index 36b3efd..aba8d3e 100644
Binary files a/data/world792/map.otbm and b/data/world792/map.otbm differ