some more changes to integration