some architectural changes in rules, robustness