including RP's comments/minor edits