map.x/map.y are now points