Need to be more diligent with VC!
Lots of changes