vjr development, refactoring