Partially updated from the diffusivity analysis