Some modifications for animation controls