Supervisor improvements on chapter 3.3 to 3.5