Adding some machine_batch secret sauce and reducing duplication for compute nodes