additional changes reuqested by rsoden, ch3,4,5,7