done a quick test pass on OSX for comparison