Animation is a little better, still not perfect