diffusers

f95c3204 - addreess more review comments