merged cli and icli