Adapted to latest ssvu