revisions from colleen's feedback
wheee merges