finishing touches for the supervisor handling