funktional pathfinder
Revert "remove by object instead of index"

This reverts commit f07e9c5bbbb8a1b10d2fe2526539bb2f7f4cdcb6.
merged