updated make_command_stream