Since latest commit remove timer should be change timer