Changes from MAC