Think I fixed animation problems