Supervisor improvements on chapter 6.1