Modified dojo_rules in branch new_rules