@zeyt: CLI will stay