changes from Mac