Added stuff from Mac