Added optional steps