diff --git a/system/autoload/Radius.php b/system/autoload/Radius.php
index c2ca2b4f..a8f7dc1b 100644
--- a/system/autoload/Radius.php
+++ b/system/autoload/Radius.php
@@ -172,7 +172,7 @@ class Radius
             if ($p) {
                 // if exists
                 Radius::delAtribute(Radius::getTableCustomer(), 'Max-All-Session', 'username', $customer['username']);
-                Radius::delAtribute(Radius::getTableCustomer(), 'Max-Data', 'username', $customer['username']);
+                Radius::delAtribute(Radius::getTableCustomer(), 'Max-Volume', 'username', $customer['username']);
                 $p->groupname = "plan_" . $plan['id'];
                 $p->save();
             } else {
@@ -189,14 +189,16 @@ class Radius
                     else
                         $timelimit = $plan['time_limit'] * 60;
                     Radius::upsertCustomer($customer['username'], 'Max-All-Session', $timelimit);
+                    //Radius::upsertCustomer($customer['username'], 'Expire-After', $timelimit);
                 } else if ($plan['limit_type'] == "Data_Limit") {
                     if ($plan['data_unit'] == 'GB')
                         $datalimit = $plan['data_limit'] . "000000000";
                     else
                         $datalimit = $plan['data_limit'] . "000000";
-                    //Radius::upsertCustomer($customer['username'], 'Max-Volume', $datalimit);
+                    Radius::upsertCustomer($customer['username'], 'Max-Volume', $datalimit);
                     // Mikrotik Spesific
-                    Radius::upsertCustomer($customer['username'], 'Max-Data', $datalimit);
+                    //Radius::upsertCustomer($customer['username'], 'Max-Data', $datalimit);
+                    //Radius::upsertCustomer($customer['username'], 'Mikrotik-Total-Limit', $datalimit);
                 } else if ($plan['limit_type'] == "Both_Limit") {
                     if ($plan['time_unit'] == 'Hrs')
                         $timelimit = $plan['time_limit'] * 60 * 60;
@@ -206,15 +208,20 @@ class Radius
                         $datalimit = $plan['data_limit'] . "000000000";
                     else
                         $datalimit = $plan['data_limit'] . "000000";
-                    //Radius::upsertCustomer($customer['username'], 'Max-Volume', $datalimit);
+                    Radius::upsertCustomer($customer['username'], 'Max-Volume', $datalimit);
                     Radius::upsertCustomer($customer['username'], 'Max-All-Session', $timelimit);
                     // Mikrotik Spesific
-                    Radius::upsertCustomer($customer['username'], 'Max-Data', $datalimit);
+                    //Radius::upsertCustomer($customer['username'], 'Max-Data', $datalimit);
+                    //Radius::upsertCustomer($customer['username'], 'Mikrotik-Total-Limit', $datalimit);
+
+
+
+
                 }
             } else {
-                //Radius::delAtribute(Radius::getTableCustomer(), 'Max-Volume', 'username', $customer['username']);
+                Radius::delAtribute(Radius::getTableCustomer(), 'Max-Volume', 'username', $customer['username']);
                 Radius::delAtribute(Radius::getTableCustomer(), 'Max-All-Session', 'username', $customer['username']);
-                Radius::delAtribute(Radius::getTableCustomer(), 'Max-Data', 'username', $customer['username']);
+                //Radius::delAtribute(Radius::getTableCustomer(), 'Max-Data', 'username', $customer['username']);
             }
 
             Radius::disconnectCustomer($customer['username']);
@@ -223,8 +230,9 @@ class Radius
 
             // expired user
             if ($expired != null) {
-                //Radius::upsertCustomer($customer['username'], 'Max-All-Session', strtotime($expired) - time());
-                Radius::upsertCustomer($customer['username'], 'expiration', date('d M Y H:i:s', strtotime($expired)));
+                //Radius::upsertCustomer($customer['username'], 'access-period', strtotime($expired) - time());
+                Radius::upsertCustomer($customer['username'], 'Max-All-Session', strtotime($expired) - time());
+                //Radius::upsertCustomer($customer['username'], 'expiration', date('d M Y H:i:s', strtotime($expired)));
                 // Mikrotik Spesific
                 Radius::upsertCustomer(
                     $customer['username'],
@@ -232,8 +240,9 @@ class Radius
                     date('Y-m-d', strtotime($expired)) . 'T' . date('H:i:s', strtotime($expired)) . Timezone::getTimeOffset($config['timezone'])
                 );
             } else {
-                //Radius::delAtribute(Radius::getTableCustomer(), 'Max-All-Session', 'username', $customer['username']);
-                Radius::delAtribute(Radius::getTableCustomer(), 'expiration', 'username', $customer['username']);
+                Radius::delAtribute(Radius::getTableCustomer(), 'Max-All-Session', 'username', $customer['username']);
+                //Radius::delAtribute(Radius::getTableCustomer(), 'access-period', 'username', $customer['username']);
+                //Radius::delAtribute(Radius::getTableCustomer(), 'expiration', 'username', $customer['username']);
             }
 
             if ($plan['type'] == 'PPPOE') {
diff --git a/version.json b/version.json
index 7078700b..e2d2d815 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.5.21"
+    "version": "2024.5.22"
 }
\ No newline at end of file