More timer changes

FUCKING BROKEN