upd mac version
wip