improve the mgr part