diff --git a/mods/seasons/init.lua b/mods/seasons/init.lua
index 03cd1bd..7b1b419 100644
--- a/mods/seasons/init.lua
+++ b/mods/seasons/init.lua
@@ -1,43 +1,81 @@
-DAY_LENGTH_TIME = 36000
+local DAY_LENGTH_TIME = 1200
 
 realtest.get_day = function()
-	local f = io.open(minetest.get_worldpath()..'/seasons.season', "r")
-	local s = 1
-	if f ~= nil then
-		s = f:read("*n")
+	local f = io.open(minetest.get_worldpath()..'/season', "r")
+	if f then
+		local n = f:read("*n")
 		io.close(f)
 	end
-	return s
+	return n or 1
 end
-realtest.set_day = function(t)
-	local f = io.open(minetest.get_worldpath()..'/seasons.season', "w")
-	f:write(t)
+
+realtest.set_day = function(n)
+	local f = io.open(minetest.get_worldpath()..'/season', "w")
+	f:write((n % 360).."\n")
+	f:write(math.floor(n / 360))
+	io.close(f)
+end
+
+realtest.get_day_and_year = function()
+	local f = io.open(minetest.get_worldpath()..'/season', "r")
+	local n = 1
+	local y = 0 
+	if f then
+		n = f:read("*n")
+		y = f:read("*n")
+		io.close(f)
+	end
+	return y, n
+end
+
+realtest.get_year =  function()
+	local f = io.open(minetest.get_worldpath()..'/season', "r")
+	if f then
+		f:read("*n")
+		local y = f:read("*n")
+		io.close(f)
+	end
+	return y or 0
+end
+
+realtest.set_year = function(y)
+	local n = realtest.get_day()
+	local f = io.open(minetest.get_worldpath()..'/season', "w")
+	f:write(n.."\n")
+	f:write(y)
 	io.close(f)
 end
 
 realtest.get_season = function()
 	local day = realtest.get_day()
-	if day > 0 then if day < 91 then return "spring" end end
-	if day > 90 then if day < 181 then return "summer" end end
-	if day > 181 then if day < 241 then return "autumn" end end
-	if day > 240 then if day < 361 then return "winter" end end
-	return "error"
+	if day > 0 and day < 91 then return "spring" end
+	if day > 90 and day < 181 then return "summer" end
+	if day > 180 and day < 241 then return "autumn" end
+	if day > 240 and  day < 361 then return "winter" end
 end
 
-add_day = function()
-	realtest.set_day(realtest.get_day()+1)
-	minetest.after(DAY_LENGTH_TIME,add_day)
+local add_day = function()
+	if realtest.get_day() + 1 >= 360 then
+		realtest.set_year(realtest.get_year() + 1)
+		realtest.set_day(1)
+	else
+		realtest.set_day(realtest.get_day() + 1)
+	end
+	minetest.after(DAY_LENGTH_TIME, add_day)
 end
 
-minetest.after(DAY_LENGTH_TIME,add_day)
+if minetest.setting_get("time_speed") ~= 0 then
+	minetest.after(DAY_LENGTH_TIME, add_day)
+end
 
 minetest.register_chatcommand("calendar", {
-	params = "<>",
+	params = "",
 	description = "get the calendar",
 	privs = {server=true},
 	func = function(name, param)
 		minetest.chat_send_player(name, "Day: "..realtest.get_day())
 		minetest.chat_send_player(name, "Season: "..realtest.get_season())
+		minetest.chat_send_player(name, "Year: "..realtest.get_year())
 	end,
 })
 
@@ -47,6 +85,16 @@ minetest.register_chatcommand("setday", {
 	privs = {server=true},
 	func = function(name, param)
 		realtest.set_day(param)
-		minetest.chat_send_player(name, "Day changed to "..param)
+		minetest.chat_send_player(name, "Day was changed to "..param)
 	end,
-})
\ No newline at end of file
+})
+
+minetest.register_chatcommand("setyear", {
+	params = "<year>",
+	description = "set the year",
+	privs = {server=true},
+	func = function(name, param)
+		realtest.set_year(param)
+		minetest.chat_send_player(name, "Year was changed to "..param)
+	end,
+})