PD update from anirvan/patch-1