Updated Build Script