Ported Michael's Dust/Flooding change