Some work on Supervisor