a little more changes to fit the mac env