Adapted to newest ssvu