Tweak timer logic but still not right