Include high voltage in gf, ensure no crsh in prod
Refactor a bit