Mac Version tested and updated