Updated RTC improvements