Some timer updates for super stability