More work on particle system