diff --git a/TODO.md b/TODO.md
index 495e83c..a9e48b2 100644
--- a/TODO.md
+++ b/TODO.md
@@ -46,3 +46,6 @@
 - [ ] Optimize the scheduler
 	- Create a separate list for processes that are waiting for a resource or a signal, etc.
 	- Use all cores to schedule threads.
+
+- [ ] Improve Remap() function.
+	- Remove Unmap & Map logic. Remove all flags directly.