diff --git a/TODO.txt b/TODO.txt
index 714fab58349283bfe223972287b1f75b709b880c..0e6b21c61bbdb27fdb45f13dbeae0b860a39b90e 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,28 +1,22 @@
-- MW mock sdn ctrl: post does not work
-- implement mock IPM controller
-
+PENDING:
+- no rule is composed for IPM controller
+- no rule is composed for L2VPN TFS SBI
 - pending infinera tests
 - test with Slice NBI
 - integrate Slice NBI in Load Gen
-- import subdevices TAPI, MW, INF
-
-- Device:
-    - IetfL2VpnDriver should not import links; otherwise, might confuse path computation component
-        - [] Add flag to control that
-    - MW Driver should import topology, there should be nothing between antennas
-    - IPM Driver should import devices but not links, TAPI in between
-    - TAPI Driver: add flag to choose; might be required in some cases
-    - enbale to create links (connectivity between subdevices)
+- sort endpoints in service and slice as done for links
 
-- OLS service: from input to input endpoint ??
-
-- pathcomp should not create reversed links
-- bidirectional links should be duplicated in frontend
-- pathcomp should honor input/output of tapi endpoints
+ONGOING:
+- implement mock IPM controller
 
 TO TEST:
-- Test with new changes in pathcomp and subservice config rule composition
-- Test device manager config in device works; rules should go to manager, not to underlying
-- ietf-l2vpn driver: test service is created
-- if there is a config rule for a endpoint in subservice, move the rule from main to that subservice
 
+
+OPTIONAL:
+    - Optimize requests pathcomp--context
+    - Optimize requests webui--context
+    - TransportAPIDriver: add flag to import underlying topology options: 'disabled/devices/all'
+    - IetfL2VpnDriver: add flag to import underlying topology options: 'disabled/devices/all'
+    - MWDriver should import topology, there should be nothing between antennas
+    - Enable to create links (connectivity between subdevices)
+    - bidirectional links should be duplicated by frontend in a smart way