More integration changes

I think this should work