I still think a more generic implementation using the particle id number would be better