Update base file closer to chapter 2 template