Switch to manual steps for now