Build script makes more sense