possibly last edits for PR