Changed all ParticleFactory calls to static