I will change the code according to your suggestion (as well in motion and participant). However, I found my single line much more easier to understand ;-)