More changes to span.