Finishing chapter 3
merged