Today
merge from timerswitch_fix