diff --git a/init.py b/init.py
index 302a728..00d8660 100644
--- a/init.py
+++ b/init.py
@@ -1,7 +1,8 @@
 from time import time
 from astral import LocationInfo
 from astral.sun import sun
-from datetime import date
+from datetime import date, datetime
+from zoneinfo import ZoneInfo
 
 from grove.gpio import GPIO
 from grove.display.jhd1802 import JHD1802
@@ -13,7 +14,6 @@ print(f"Timezone: {city.timezone}")
 print(f"Latitude: {city.latitude:.6f}; Longitude: {city.longitude:.6f}")
 
 def isSunUp() -> bool:
-    from datetime import datetime
     now = datetime.now(city.tzinfo)
     return s["sunrise"] <= now <= s["sunset"]
 
@@ -53,9 +53,9 @@ class AlarmClock:
         currentTime = time()
 
         if (self.configMode == "normal"):
-            currentMinute = int((currentTime / 60) % 60)
-            currentHour = int((currentTime / 3600) % 24)
-            currrentSecond = int(currentTime % 60)
+            currentMinute = datetime.now(ZoneInfo(city.timezone)).minute
+            currentHour = datetime.now(ZoneInfo(city.timezone)).hour
+            currrentSecond = datetime.now(ZoneInfo(city.timezone)).second
 
             self.setLcdText(f"Time {currentHour:02d}:{currentMinute:02d}:{currrentSecond:02d}\nAlarm {self.alarmHour:02d}:{self.alarmMinute:02d}")