modify to fit new cli conf