refactor for hltevzw