Changes from mac