More work on regular PSO.