Adjustments to be able to control animations