3rd commit after finishing chapter 5