Updated Supervisor controller