latest changes to ruleset logic