diff -Nru indi-aok-2.0+t202402030751~ubuntu22.04.1/debian/changelog indi-aok-2.0+t202404021923~ubuntu22.04.1/debian/changelog
--- indi-aok-2.0+t202402030751~ubuntu22.04.1/debian/changelog	2024-02-03 07:51:58.000000000 +0000
+++ indi-aok-2.0+t202404021923~ubuntu22.04.1/debian/changelog	2024-04-02 19:23:53.000000000 +0000
@@ -1,8 +1,8 @@
-indi-aok (2.0+t202402030751~ubuntu22.04.1) jammy; urgency=low
+indi-aok (2.0+t202404021923~ubuntu22.04.1) jammy; urgency=low
 
   * Auto build.
 
- -- Jasem Mutlaq <mutlaqja@ikarustech.com>  Sat, 03 Feb 2024 07:51:58 +0000
+ -- Jasem Mutlaq <mutlaqja@ikarustech.com>  Tue, 02 Apr 2024 19:23:53 +0000
 
 indi-aok (2.0) bionic; urgency=low (overhaul for firmware 21 of TCS)
   * cleaned up structure of source code
diff -Nru indi-aok-2.0+t202402030751~ubuntu22.04.1/debian/git-build-recipe.manifest indi-aok-2.0+t202404021923~ubuntu22.04.1/debian/git-build-recipe.manifest
--- indi-aok-2.0+t202402030751~ubuntu22.04.1/debian/git-build-recipe.manifest	2024-02-03 07:51:58.000000000 +0000
+++ indi-aok-2.0+t202404021923~ubuntu22.04.1/debian/git-build-recipe.manifest	2024-04-02 19:23:53.000000000 +0000
@@ -1,5 +1,5 @@
-# git-build-recipe format 0.4 deb-version {debupstream}+t202402030751
+# git-build-recipe format 0.4 deb-version {debupstream}+t202404021923
 lp:~mutlaqja/+git/dummy git-commit:9a182f35d7f48b02de1170889c0798f3ab639afb
-nest-part src lp:~mutlaqja/libindi/+git/trunk indi-aok indi-aok git-commit:bb07fa3ebecce9da97a2d9e03e2f86b542691c91
-nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-aok/cmake_modules git-commit:bb07fa3ebecce9da97a2d9e03e2f86b542691c91
-nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-aok debian git-commit:bb07fa3ebecce9da97a2d9e03e2f86b542691c91
+nest-part src lp:~mutlaqja/libindi/+git/trunk indi-aok indi-aok git-commit:cd5aac9913e2e3473cdc3f6e8ff2dfee4f24c525
+nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-aok/cmake_modules git-commit:cd5aac9913e2e3473cdc3f6e8ff2dfee4f24c525
+nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-aok debian git-commit:cd5aac9913e2e3473cdc3f6e8ff2dfee4f24c525
diff -Nru indi-aok-2.0+t202402030751~ubuntu22.04.1/indi-aok/indi-aok.spec indi-aok-2.0+t202404021923~ubuntu22.04.1/indi-aok/indi-aok.spec
--- indi-aok-2.0+t202402030751~ubuntu22.04.1/indi-aok/indi-aok.spec	2024-02-03 07:51:53.000000000 +0000
+++ indi-aok-2.0+t202404021923~ubuntu22.04.1/indi-aok/indi-aok.spec	2024-04-02 19:23:46.000000000 +0000
@@ -1,6 +1,6 @@
 %define __cmake_in_source_build %{_vpath_builddir}
 Name: indi-aok
-Version:2.0.2.git
+Version:2.0.6.git
 Release: %(date -u +%%Y%%m%%d%%H%%M%%S)%{?dist}
 Summary: Instrument Neutral Distributed Interface 3rd party drivers
 
diff -Nru indi-aok-2.0+t202402030751~ubuntu22.04.1/indi-aok/lx200aok.cpp indi-aok-2.0+t202404021923~ubuntu22.04.1/indi-aok/lx200aok.cpp
--- indi-aok-2.0+t202402030751~ubuntu22.04.1/indi-aok/lx200aok.cpp	2024-02-03 07:51:53.000000000 +0000
+++ indi-aok-2.0+t202404021923~ubuntu22.04.1/indi-aok/lx200aok.cpp	2024-04-02 19:23:46.000000000 +0000
@@ -37,16 +37,16 @@
 
 static class Loader
 {
-    std::unique_ptr<LX200Skywalker> telescope;
-public:
-    Loader()
-    {
-        if (telescope.get() == nullptr)
+        std::unique_ptr<LX200Skywalker> telescope;
+    public:
+        Loader()
         {
-            LX200Skywalker* myScope = new LX200Skywalker();
-            telescope.reset(myScope);
+            if (telescope.get() == nullptr)
+            {
+                LX200Skywalker* myScope = new LX200Skywalker();
+                telescope.reset(myScope);
+            }
         }
-    }
 } loader;
 
 /**************************************************
@@ -256,19 +256,19 @@
             else
                 return false;
         }
-        if (!strcmp(name, ParkOptionSP.name))
+        if (ParkOptionSP.isNameMatch(name))
         {
-            IUUpdateSwitch(&ParkOptionSP, states, names, n);
-            int index = IUFindOnSwitchIndex(&ParkOptionSP);
+            ParkOptionSP.update(states, names, n);
+            int index = ParkOptionSP.findOnSwitchIndex();
             if (index == -1)
                 return false;
-            IUResetSwitch(&ParkOptionSP);
+            ParkOptionSP.reset();
             if ((TrackState != SCOPE_IDLE && TrackState != SCOPE_TRACKING) || MovementNSSP.s == IPS_BUSY ||
                     MovementWESP.s == IPS_BUSY)
             {
                 LOG_WARN("Mount slewing or already parked...");
-                ParkOptionSP.s = IPS_ALERT;
-                IDSetSwitch(&ParkOptionSP, nullptr);
+                ParkOptionSP.setState(IPS_ALERT);
+                ParkOptionSP.apply();
                 return false;
             }
             bool result = false;
@@ -359,11 +359,10 @@
 
     // Setting the park position in the controller (with webinterface) evokes a restart of the very same!
     // 4th option "purge" of INDI::Telescope doesn't make any sense here, so it is not displayed
-    IUFillSwitch(&ParkOptionS[PARK_CURRENT], "PARK_CURRENT", "Copy", ISS_OFF);
-    IUFillSwitch(&ParkOptionS[PARK_DEFAULT], "PARK_DEFAULT", "Read", ISS_OFF);
-    IUFillSwitch(&ParkOptionS[PARK_WRITE_DATA], "PARK_WRITE_DATA", "Write", ISS_OFF);
-    IUFillSwitchVector(&ParkOptionSP, ParkOptionS, 3, getDeviceName(), "TELESCOPE_PARK_OPTION", "Park Options",
-                       SITE_TAB, IP_RW, ISR_ATMOST1, 60, IPS_IDLE);
+    ParkOptionSP[PARK_CURRENT].fill("PARK_CURRENT", "Copy", ISS_OFF);
+    ParkOptionSP[PARK_DEFAULT].fill("PARK_DEFAULT", "Read", ISS_OFF);
+    ParkOptionSP[PARK_WRITE_DATA].fill("PARK_WRITE_DATA", "Write", ISS_OFF);
+    ParkOptionSP.fill(getDeviceName(), "TELESCOPE_PARK_OPTION", "Park Options", SITE_TAB, IP_RW, ISR_ATMOST1, 60, IPS_IDLE);
 
     return true;
 }