implementing jen's edits from gdocs