fixed conflicts.. where did ParticleList go tho??!