Refactor design.
Don't use enableAnimation for disabling it. Fix API.
Update event callbacks in main routines.