2033 sv refactor

#2033