Adapted to new ssvu