More adjustments to the diffusion class