More changes based on carolyn's recommendations