Added rgxp=mac support