improve cli
improve cli 2