Updates based on Dr. Hofmann's feedback