merge Arun's gads7 through lesson 8