Enhanced build - tested on osx