Changes from Mac Pro