Modified MAC version