Update to fns-tracking