added some changes to step_7 branch