some changes for MAC