Created new rules and updated to align with newest generator