diff --git a/agent/helpers/watcher.c b/agent/helpers/watcher.c
index 9b3933b..93eed4a 100644
--- a/agent/helpers/watcher.c
+++ b/agent/helpers/watcher.c
@@ -319,6 +319,7 @@ netsnmp_watcher_helper_handler(netsnmp_mib_handler *handler,
         break;
 
     case MODE_SET_COMMIT:
+        snmp_store_needed(NULL);        //TBD may be not needed, but snmp_mib and system_mib needs this! ck
         break;
 #endif /* NETSNMP_NO_WRITE_SUPPORT */
 
diff --git a/agent/mibgroup/mibII/snmp_mib.c b/agent/mibgroup/mibII/snmp_mib.c
index a056d99..532d9dd 100644
--- a/agent/mibgroup/mibII/snmp_mib.c
+++ b/agent/mibgroup/mibII/snmp_mib.c
@@ -109,7 +109,7 @@ init_snmp_mib(void)
         const oid snmpEnableAuthenTraps_oid[] = { 1, 3, 6, 1, 2, 1, 11, 30, 0 };
 	static netsnmp_watcher_info enableauthen_info;
         netsnmp_handler_registration *reg =
-            netsnmp_create_update_handler_registration(
+            netsnmp_create_update_handler_registration(        // FIXME how to trigger snmp_store_needed() after commit
                 "mibII/snmpEnableAuthenTraps",
                 snmpEnableAuthenTraps_oid,
                 OID_LENGTH(snmpEnableAuthenTraps_oid),
diff --git a/agent/mibgroup/mibII/snmp_mib_5_5.c b/agent/mibgroup/mibII/snmp_mib_5_5.c
index 6484e3c..137ae72 100644
--- a/agent/mibgroup/mibII/snmp_mib_5_5.c
+++ b/agent/mibgroup/mibII/snmp_mib_5_5.c
@@ -26,11 +26,14 @@ snmp_enableauthentraps_store(int a, int b, void *c, void *d)
 {
     char            line[SNMP_MAXBUF_SMALL];
 
-    if (snmp_enableauthentrapsset > 0) {
+    //FIXME always 0! ck if (snmp_enableauthentrapsset > 0) {
         snprintf(line, SNMP_MAXBUF_SMALL, "pauthtrapenable %ld",
                  snmp_enableauthentraps);
         snmpd_store_config(line);
-    }
+    //FIXME }
+
+    snprintf(line, SNMP_MAXBUF_SMALL, "snmp_enableauthentrapsset %ld", snmp_enableauthentrapsset); snmpd_store_config(line);//TODO remove line! ck
+
     return 0;
 }
 
@@ -96,11 +99,11 @@ init_snmp_mib_5_5(void)
 	static netsnmp_watcher_info enableauthen_info;
         netsnmp_handler_registration *reg =
 #ifndef NETSNMP_NO_WRITE_SUPPORT
-            netsnmp_create_update_handler_registration(
+            netsnmp_create_update_handler_registration(        // FIXME how to trigger snmp_store_needed() after commit
                 "mibII/snmpEnableAuthenTraps",
                 snmpEnableAuthenTraps_oid,
                 OID_LENGTH(snmpEnableAuthenTraps_oid),
-                HANDLER_CAN_RWRITE, &snmp_enableauthentrapsset);
+                HANDLER_CAN_RWRITE, &snmp_enableauthentrapsset);        //TODO this value will never change? ck
 #else  /* !NETSNMP_NO_WRITE_SUPPORT */
             netsnmp_create_update_handler_registration(
                 "mibII/snmpEnableAuthenTraps",
@@ -112,7 +115,7 @@ init_snmp_mib_5_5(void)
         netsnmp_inject_handler(reg, netsnmp_get_truthvalue());
         netsnmp_register_watched_instance(
             reg,
-            netsnmp_init_watcher_info(
+            netsnmp_init_watcher_info(  // TODO what is this for? it does not work as expected ck
 		&enableauthen_info,
                 &snmp_enableauthentraps, sizeof(snmp_enableauthentraps),
                 ASN_INTEGER, WATCHER_FIXED_SIZE));
diff --git a/agent/mibgroup/mibII/system_mib.c b/agent/mibgroup/mibII/system_mib.c
index 65b0b7c..26d8fe5 100644
--- a/agent/mibgroup/mibII/system_mib.c
+++ b/agent/mibgroup/mibII/system_mib.c
@@ -355,9 +355,9 @@ init_system_mib(void)
         const oid sysContact_oid[] = { 1, 3, 6, 1, 2, 1, 1, 4 };
         static netsnmp_watcher_info sysContact_winfo;
 #ifndef NETSNMP_NO_WRITE_SUPPORT
-        netsnmp_register_watched_scalar(
+        netsnmp_register_watched_scalar(        // FIXME how to trigger snmp_store_needed() after commit
             netsnmp_create_update_handler_registration(
-                "mibII/sysContact", sysContact_oid, OID_LENGTH(sysContact_oid), 
+                "mibII/sysContact", sysContact_oid, OID_LENGTH(sysContact_oid),
                 HANDLER_CAN_RWRITE, &sysContactSet),
             netsnmp_init_watcher_info(
                 &sysContact_winfo, sysContact, SYS_STRING_LEN - 1,
@@ -376,7 +376,7 @@ init_system_mib(void)
         const oid sysName_oid[] = { 1, 3, 6, 1, 2, 1, 1, 5 };
         static netsnmp_watcher_info sysName_winfo;
 #ifndef NETSNMP_NO_WRITE_SUPPORT
-        netsnmp_register_watched_scalar(
+        netsnmp_register_watched_scalar(        // FIXME how to trigger snmp_store_needed() after commit
             netsnmp_create_update_handler_registration(
                 "mibII/sysName", sysName_oid, OID_LENGTH(sysName_oid),
                 HANDLER_CAN_RWRITE, &sysNameSet),
@@ -397,7 +397,7 @@ init_system_mib(void)
         const oid sysLocation_oid[] = { 1, 3, 6, 1, 2, 1, 1, 6 };
         static netsnmp_watcher_info sysLocation_winfo;
 #ifndef NETSNMP_NO_WRITE_SUPPORT
-        netsnmp_register_watched_scalar(
+        netsnmp_register_watched_scalar(        // FIXME how to trigger snmp_store_needed() after commit
             netsnmp_create_update_handler_registration(
                 "mibII/sysLocation", sysLocation_oid,
                 OID_LENGTH(sysLocation_oid),