more edits for r5