amended dojo_rules