Updated for span positioning.