Keyframe overhaul