Adding some of the code necessary for SVs