Changes for command line control system