Bug fix and new ruleset.