Refactor. Fix oval timer restart bug.