Improved animation
Improved instrumentation