edit and commit step