Changed back to spans