moved optional steps to the bottom