some changes for mac version