partial voi refactoring