added particle system
merge