Adapted to newest sses/ssvsc