Particle Wave Surfers Extended