improved the map engine