Bring Mr. Alvord up to speed with my changes