Updated, fixed bug where timer didn't get cleared.