Changed animation if-else to switch, moved animation resets to temporary function