refacored animations