Added stopping of timer