further fixing of pwp integration m(