Feature/chapter 3 work