Correct reset functionality
Re-correct reset functionality
Add timer