First attempt at update_particles
attemp at merging conflict