added a little better way to re-generate features to track