animation fixx
Merge branch 'sean'