Done in next ver. Additional `span`s removed as well