Addition of some new rules
updating the TODO list