XVM Changes.