vjr object refactoring, completed