worked towards including PUPPI
resolved a pending conflict