Changes to make it VC compatible