Added RTC improvements