make changes 7-10 from Hugh email