This is 3rd party code, I want the changes to be as transparent to them as possible.