More changes based on mike's feedback.