Changes for mac
Merge conflict resolved