Coordinate mapper works OK now