REFACTOR: following changes in Dawn plotting