includes RG edits
includes Rebecca's comments