Since I havent updated the SVN, only my local machine, I think any patch should be built off the existing SVN. Meaning add in the struct changes plus any op code changes.

I did not know there was another patch today. I would rather go fresh as if the patch on Thurs didn't happen.