Supervisor improvements on chapter 5