Particle optimisation and collision fixed