Updated to include span tags.