complete rework of the source & new particles