Finish CLI version
Finish CLI version