Added keyframe setting but this may be incorrect