diff --git a/TODO.txt b/TODO.txt
index 343d54e2867df9a0a8fe460e704dd9413b1a8d29..714fab58349283bfe223972287b1f75b709b880c 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,9 +1,28 @@
-- confirm with Hakim everything is in branch hakim-develop-patch-44885
-- merge branch hakim-develop-patch-44885 into feat/device-ietf-l2vpn
-- delete branch hakim-develop-patch-44885
-
-- update OFC'23 to deploy 2 instances without blockchain
-dom1 => parent
-dom2 => child
-dom3/4 => remove
-replace nfvsdn22 => ofc23
+- MW mock sdn ctrl: post does not work
+- implement mock IPM controller
+
+- 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)
+
+- 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
+
+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
+