Cmdline improved