Improvements for animation