MapCoords improved