Update to new tracking algo for testing