first changes from MAC