Initial changes to next step