rearrange and add SVS integration