added some changes for the mac