Changed Code For New RMA