animation fixx
Merge branch 'sean'
Merge branch 'Jimmy'