added stuff from mac