Tweaks to help SVS run faster
Tweaks to help SVS run faster