almost fixed map
special span added back