Added find_span