branch to manage pd_integration