updated MAC ifdefed code for QREST-35 & QREST-36