Updates

Look at inner While loop in make_command_stream