major change in path tracking to remove nasty bug