This is the new VMA2 changes