minor changes in marks and save flow