further changes to integrate