Supervisor improvements on chapter 4