small changes for integration