Updated animations / refactoring