MacOS changes
merging