More refactoring and de coupling of vc from data.