Added Pieter's edits - in comments tagged with %%PA