making animations more foolproof :)