diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt
index 84095c3773..891e75fc06 100644
--- a/core/src/com/unciv/logic/city/CityExpansionManager.kt
+++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt
@@ -26,7 +26,6 @@ class CityExpansionManager {
                 .map { it.position }
         return cityInfo.tiles.count { it != cityInfo.location && it !in tilesAroundCity}
     }
-    fun isAreaMaxed(): Boolean = cityInfo.tiles.size >= 90
 
     // This one has conflicting sources -
     // http://civilization.wikia.com/wiki/Mathematics_of_Civilization_V says it's 20+(10(t-1))^1.1
@@ -98,10 +97,6 @@ class CityExpansionManager {
     }
 
     private fun addNewTileWithCulture(): Boolean {
-        if (isAreaMaxed()) {
-            cultureStored = 0
-            return false
-        }
         val chosenTile = chooseNewTileToOwn()
         if (chosenTile != null) {
             cultureStored -= getCultureToNextTile()
diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt
index b4da0a09d9..fbda9945b1 100644
--- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt
@@ -60,7 +60,7 @@ class CityStatsTable(val cityScreen: CityScreen): Table() {
                 } else {
                     "Stopped expansion".tr()
                 }
-        if (!cityInfo.expansion.isAreaMaxed())
+        if (cityInfo.expansion.chooseNewTileToOwn()!=null)
             turnsToExpansionString += " (" + cityInfo.expansion.cultureStored + "/" +
                 cityInfo.expansion.getCultureToNextTile() + ")"
 
diff --git a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
index 4fcc783cb7..2e3ff8d2e8 100644
--- a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
+++ b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
@@ -116,7 +116,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
                         val tile = tileGroup.tileInfo
                         if (tile.improvement == improvementName && tile != it)
                             tile.improvement = null
-                        tile.setTransients()
+                        tile.setTerrainTransients()
                         tileGroup.update()
                     }
                 }
@@ -249,7 +249,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
                 } else tileInfo.baseTerrain = terrain
 
                 tileInfo.resource = resource.name
-                tileInfo.setTransients()
+                tileInfo.setTerrainTransients()
 
                 setCurrentHex(tileInfo, resource.name.tr() + "\n" + resource.clone().toString())
             }
@@ -332,7 +332,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
     }
 
     private fun makeTileGroup(tileInfo: TileInfo): TileGroup {
-        tileInfo.setTransients()
+        tileInfo.setTerrainTransients()
         val group = TileGroup(tileInfo, TileSetStrings())
         group.showEntireMap = true
         group.forMapEditorIcon = true