adding grace's edits