Minor changes to integration