Working version with dust opacity