edits from pjd