cleaner animation code
merge