*8212* Review revisions code to PKP lib