Added the ability to enable/disable animation