Xvsm part should work in principle but better testing should be done