Code changes proposed by Jeff and Ian