Updates suggested by Dr. Hofmann