changed the arrays to vetors of particle objects
conflict fix