refactoring for vasm, per obed 0.70