Changed mapX and mapY and added range