hopefully last changes to particles
merged