switched to tabulators and handling files where diffusion is None