Added a global position to the particle container and cleaned up the code
conflict fix