Timerra S-Support edit (@BetterCommSoul)