upgraded tilemap to make more sense