Changes made by Jeff.