diff --git a/demo/scheme/src/jvmMain/kotlin/Main.kt b/demo/scheme/src/jvmMain/kotlin/Main.kt
index 3555a63..9296e0e 100644
--- a/demo/scheme/src/jvmMain/kotlin/Main.kt
+++ b/demo/scheme/src/jvmMain/kotlin/Main.kt
@@ -37,7 +37,7 @@ fun App() {
             text(1132.0881 to 394.99127, "Ordruin").color(Color.Red)
             arc(center = 1132.0881 to 394.99127, radius = 20f, startAngle = 0f, 2 * PI.toFloat())
 
-            circle(410.52737 to 868.7676, id = "hobbit")
+            //circle(410.52737 to 868.7676, id = "hobbit")
 
             scope.launch {
                 var t = 0.0
diff --git a/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/FeatureGroup.kt b/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/FeatureGroup.kt
index 5212d74..2e44ee4 100644
--- a/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/FeatureGroup.kt
+++ b/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/FeatureGroup.kt
@@ -187,7 +187,7 @@ public data class FeatureGroup<T : Any>(
         public fun <T : Any> remember(
             coordinateSpace: CoordinateSpace<T>,
             builder: FeatureGroup<T>.() -> Unit = {},
-        ): FeatureGroup<T> = remember(builder) {
+        ): FeatureGroup<T> = remember{
             build(coordinateSpace, builder)
         }
 
diff --git a/maps-kt-scheme/src/commonMain/kotlin/center/sciprog/maps/scheme/schemeFeatures.kt b/maps-kt-scheme/src/commonMain/kotlin/center/sciprog/maps/scheme/schemeFeatures.kt
index 74cc049..756d26b 100644
--- a/maps-kt-scheme/src/commonMain/kotlin/center/sciprog/maps/scheme/schemeFeatures.kt
+++ b/maps-kt-scheme/src/commonMain/kotlin/center/sciprog/maps/scheme/schemeFeatures.kt
@@ -8,7 +8,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import center.sciprog.attributes.Attributes
-import center.sciprog.attributes.ZAttribute
 import center.sciprog.maps.features.*
 
 internal fun Pair<Number, Number>.toCoordinates(): XY = XY(first.toFloat(), second.toFloat())
diff --git a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt
index 3a76515..de89384 100644
--- a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt
+++ b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt
@@ -93,7 +93,7 @@ public fun SchemeView(
         }
     }
 
-    val state = rememberMapState(
+    val state = XYViewScope.remember(
         config,
         initialViewPoint = initialViewPoint,
         initialRectangle = initialRectangle ?: featureState.features.computeBoundingBox(XYCoordinateSpace, Float.MAX_VALUE),
@@ -118,7 +118,7 @@ public fun SchemeView(
     buildFeatures: FeatureGroup<XY>.() -> Unit = {},
 ) {
     val featureState = FeatureGroup.remember(XYCoordinateSpace, buildFeatures)
-    val mapState: XYViewScope = rememberMapState(
+    val mapState: XYViewScope = XYViewScope.remember(
         config,
         initialViewPoint = initialViewPoint,
         initialRectangle = initialRectangle ?: featureState.features.computeBoundingBox(XYCoordinateSpace, Float.MAX_VALUE),
diff --git a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt
index 89b13a8..54d041f 100644
--- a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt
+++ b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt
@@ -8,7 +8,6 @@ import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.graphics.drawscope.translate
 import androidx.compose.ui.graphics.painter.Painter
-import center.sciprog.attributes.AlphaAttribute
 import center.sciprog.maps.features.*
 import center.sciprog.maps.scheme.*
 import org.jfree.svg.SVGGraphics2D