more integration changes