address feedback from paf31