Adjusted code base for Mac
committing merge