Major refactoring root vc