Fix: Particle optimization