[Design-team] Design for diffusion