Removed animations and remove end check