Added Brendan's particle changes