Make animation optional, enabled by default