mac key stuff
merge