merged from mac