Changes to almost completely functional environment