more changes to span