More changes; about to switch back to separate Results and Discussion