add cli processing
merge changes