updated with latest particle system changes