Use new simpler particle input