worknig version on mac, before merge
mac-linux merged mersion