Worked on animation compatability