still fixing up diffusion analysis