a few edits via angela