Adding Christina's Changes

Christina's changes would not merge, so I manually added them in.