New Configurator
Configurator cleanup
HotFix