GAMM RTC enhancements