Adjustments to command_line