Adapted to latest SSVS