Added option for animation control