Command line demo changes