Added new rules
Removed not needed items