VARGP refactoring completed