added mac stuff