Update to the way multi-step-modal works