Fixed timer to work with new animations