Min, I prefer not to do this since there is already 28 patches. The line changes are mostly from the .h and .c files, I do not think there is much benefit from moving the the .inf files to a different patch.  Doing something like that will still leave 5800 lines changes in this patch. Judah