changes from MAC