map-speed added.