Implemented some more rules