moved over retreat rules from old branch