Added new rules, cleaned Up