added non-bang version of update_tracked_fields