Re-integrated rulesets into amcat