Updated files to closelly follow the book