Changes from Mac.