bundle and bundle-less versions for Mac