completed first CLI version