Charge ahead to get ready for RMAR changes