A couple changes for integration