Updates to atdm strategies, bug fix for RM