Vc code branch

This should allow you to bring the changes that I have made