Optimised swarming demo a little