Timer functionality corrected