Updated scripts and bake template