Adding mp-smoke for diagnostics