Updated RDM to make use of more Estoqueur's gear.