Adapted to SUJ usage