diffusers

cb6d5fed - refator based on dhruv's feedbacks