diff --git a/TODO b/TODO
index b7809f40..8bbc391b 100644
--- a/TODO
+++ b/TODO
@@ -25,7 +25,11 @@ ToDos in Priority order:
   onAppChange
   onScreenChange
   rename current onScreenChange to onScreenUpdate
-  
+- add perApplicationTrigger trigger
+  per application commands
+  per application onScreenChange
+  per application onInput
+- per application shortcuts
 - implement commands
   define_window
   remove_window
@@ -40,14 +44,12 @@ ToDos in Priority order:
     curr item
     first item
     last item
-  
-- implement onScreenChange commands
+- improve performance  
+- pass environment instance in init and remove it from function calls
+
+- implement onScreenChange (new onScreenUpdate) commands
   read highlighted text mode
   window mode (define a area and just read that changes)
-- add onApplicationChange trigger
-  per application commands
-  per application onScreenChange
-  per application onInput
 - add the debugging to core  
 - autostart systemd
 https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/System_Administrators_Guide/sect-Managing_Services_with_systemd-Unit_Files.html