Adding remaining steps