#26 removing span 186 - 190