Made some changes to the particle class