Added Hannah's changes 10/30