Updated to build script