VE-BugFixes refactor method usage