Updating with Kurt Jaeger's changes to match final committed version