ISSUE=9664 working on improving the CLI