finished fixing timers