changes by Jeff request