Adapted to newest ssvs