updated it so the build environment is more sane!