build script improved