changes to step_7
changes for merge