Finish the CLI version