Build Script: more work