VE-BugFixes refactor method usage part 2