Adapted to newest SSVS

Syntax can probably be improved