Better timer canceling?
Attempt to merge