made some changes Megan requested
merged changes