completed chapter 2
merged