some refactoring for vombat