First round of last changes (Dr. Cramer)