first draft of diffusion system support + minor
first draft of diffusion system support + minor