Update via RCR's edits