Attempt to update timers more properly, still throws a bunch of errors