Changes from Herr Compilador