some changes from OSX