Supervisor improvements on chapter 2.3