Changes to Span