Adapting to newest SSVS (wip)