add handling for mac as well as label