substantial changes to treatment of exercise_set entry