Unit 6 changes from mentor's feedback