Added option to disable animations