commit for PDPB-3

Please review this branch.