Initial attempt at fixing the animation. More work is needed