Modified dojo_rules on branch new_rules