adapted changes in rule system