Refactor to use changes in dust
Refactor to use changes in dust