Feature/particles