Optimizations, new diffusion impl, ready for aws