updated for cli-extra and cli to work.