Supervisor improvements on chapter 7