mering changes from window version to mac version