Adding initial Mac changes