still fixing map over particles