Improved the build script once more