Adding some rules
Change the structure a bit