Adapted to newest SSVS and SSES