Animation added
refactoring