diff --git a/PWGLF/Tasks/NucleiHistTask.cxx b/PWGLF/Tasks/NucleiHistTask.cxx
index fa194c7b8d5..b3423a3e8e8 100644
--- a/PWGLF/Tasks/NucleiHistTask.cxx
+++ b/PWGLF/Tasks/NucleiHistTask.cxx
@@ -99,14 +99,14 @@ struct NucleiHistTask {
     spectra.add("histRecVtxZData", "collision z position", HistType::kTH1F, {{200, -20., +20., "z position (cm)"}});
     spectra.add("histTpcSignalData", "Specific energy loss", HistType::kTH2F, {{600, -6., 6., "#it{p} (GeV/#it{c})"}, {1400, 0, 1400, "d#it{E} / d#it{X} (a. u.)"}});
     spectra.add("histTofSignalData", "TOF signal", HistType::kTH2F, {{600, -6., 6., "#it{p} (GeV/#it{c})"}, {550, 0.0, 1.1, "#beta (TOF)"}});
-    spectra.add("histDcaVsPtData_particle", "dcaXY vs Pt (particle)", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
-    spectra.add("histDcaZVsPtData_particle", "dcaZ vs Pt (particle)", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
-    spectra.add("histDcaVsPtData_wo_ambiguous_particle", "dcaXY vs Pt (particle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
-    spectra.add("histDcaZVsPtData_wo_ambiguous_particle", "dcaZ vs Pt (particle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
-    spectra.add("histDcaVsPtData_antiparticle", "dcaXY vs Pt (antiparticle)", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
-    spectra.add("histDcaZVsPtData_antiparticle", "dcaZ vs Pt (antiparticle)", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
-    spectra.add("histDcaVsPtData_wo_ambiguous_antiparticle", "dcaXY vs Pt (antiparticle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
-    spectra.add("histDcaZVsPtData_wo_ambiguous_antiparticle", "dcaZ vs Pt (antiparticle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -0.1, 0.1, "dca"}});
+    spectra.add("histDcaVsPtData_particle", "dcaXY vs Pt (particle)", HistType::kTH2F, {ptAxis, {200, -0.5, 0.5, "dca"}});
+    spectra.add("histDcaZVsPtData_particle", "dcaZ vs Pt (particle)", HistType::kTH2F, {ptAxis, {200, -2.0, 2.0, "dca"}});
+    spectra.add("histDcaVsPtData_wo_ambiguous_particle", "dcaXY vs Pt (particle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -0.5, 0.5, "dca"}});
+    spectra.add("histDcaZVsPtData_wo_ambiguous_particle", "dcaZ vs Pt (particle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -2.0, 2.0, "dca"}});
+    spectra.add("histDcaVsPtData_antiparticle", "dcaXY vs Pt (antiparticle)", HistType::kTH2F, {ptAxis, {200, -0.5, 0.5, "dca"}});
+    spectra.add("histDcaZVsPtData_antiparticle", "dcaZ vs Pt (antiparticle)", HistType::kTH2F, {ptAxis, {200, -2.0, 2.0, "dca"}});
+    spectra.add("histDcaVsPtData_wo_ambiguous_antiparticle", "dcaXY vs Pt (antiparticle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -0.5, 0.5, "dca"}});
+    spectra.add("histDcaZVsPtData_wo_ambiguous_antiparticle", "dcaZ vs Pt (antiparticle) w/o ambiguous", HistType::kTH2F, {ptAxis, {200, -2.0, 2.0, "dca"}});
     spectra.add("histTOFm2", "TOF m^2 vs Pt", HistType::kTH2F, {ptAxis, {400, 0.0, 10.0, "m^2"}});
 
     spectra.add("histNClusterTPC", "Number of Clusters in TPC vs Pt", HistType::kTH2F, {ptAxis, {160, 0.0, 160.0, "nCluster"}});
@@ -237,8 +237,21 @@ struct NucleiHistTask {
   Configurable<float> nsigmacutLow{"nsigmacutLow", -3.0, "Value of the Nsigma cut"};
   Configurable<float> nsigmacutHigh{"nsigmacutHigh", +3.0, "Value of the Nsigma cut"};
 
+  // Replacement for globalTrack filter
+  Configurable<float> minNCrossedRowsTPC{"minNCrossedRowsTPC", 70.0f, "min number of crossed rows TPC"};
+  Configurable<float> minRatioCrossedRowsTPC{"minRatioCrossedRowsTPC", 0.8f, "min ratio of crossed rows over findable clusters TPC"};
+  Configurable<float> maxChi2TPC{"maxChi2TPC", 4.0f, "max chi2 per cluster TPC"};
+  Configurable<float> maxChi2ITS{"maxChi2ITS", 36.0f, "max chi2 per cluster ITS"};
+  Configurable<float> reqTPCrefit{"reqTPCrefit", true, "require TPC refit"};
+  Configurable<float> reqITSrefit{"reqITSrefit", true, "require ITS refit"};
+  Configurable<float> maxDCA_Z{"maxDCA_Z", 2.0f, "max DCA to vertex z"};
+  Configurable<float> maxDCA_XY{"maxDCA_XY", 0.5f, "max DCA to vertex xy"};
+  Configurable<float> minReqClusterITS{"minReqClusterITS", 1.0, "min number of clusters required in ITS"};
+  Configurable<float> pTmin{"pTmin", 0.1f, "min pT"};
+  Configurable<float> pTmax{"pTmax", 1e+10f, "max pT"};
+
   Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
-  Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (requireGlobalTrackInFilter());
+  Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta); // && (requireGlobalTrackInFilter());
 
   using TrackCandidates = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::pidTPCLfFullPr, aod::pidTOFFullPr, aod::pidTPCLfFullDe, aod::pidTOFFullDe, aod::pidTPCLfFullHe, aod::pidTOFFullHe, aod::TrackSelection, aod::TrackSelectionExtension, aod::TOFSignal, aod::pidTOFmass, aod::pidTOFbeta>>; // aod::ReducedTracks, aod::CentFV0As
 
@@ -258,6 +271,29 @@ struct NucleiHistTask {
 
     for (auto track : tracks) { // start loop over tracks
 
+      float TPCnumberCls = track.tpcNClsFound();
+      float RatioCrossedRowsOverFindableTPC = track.tpcCrossedRowsOverFindableCls();
+      float Chi2perClusterTPC = track.tpcChi2NCl();
+      float Chi2perClusterITS = track.itsChi2NCl();
+
+      if (TPCnumberCls < minNCrossedRowsTPC || RatioCrossedRowsOverFindableTPC < minRatioCrossedRowsTPC || Chi2perClusterTPC > maxChi2TPC || Chi2perClusterITS > maxChi2ITS || !(track.passedTPCRefit()) || !(track.passedITSRefit()) || track.itsNCls() < minReqClusterITS || track.pt() < pTmin || track.pt() > pTmax) {
+        continue;
+      }
+
+      if (track.sign() > 0) {
+        spectra.fill(HIST("histDcaVsPtData_particle"), track.pt(), track.dcaXY());
+        spectra.fill(HIST("histDcaZVsPtData_particle"), track.pt(), track.dcaZ());
+      }
+
+      if (track.sign() < 0) {
+        spectra.fill(HIST("histDcaVsPtData_antiparticle"), track.pt(), track.dcaXY());
+        spectra.fill(HIST("histDcaZVsPtData_antiparticle"), track.pt(), track.dcaZ());
+      }
+
+      if (TMath::Abs(track.dcaXY()) > maxDCA_XY || TMath::Abs(track.dcaZ()) > maxDCA_Z) {
+        continue;
+      }
+
       // cut on rapidity
       TLorentzVector lorentzVector_proton{};
       TLorentzVector lorentzVector_deuteron{};
@@ -288,8 +324,6 @@ struct NucleiHistTask {
         proton_erg.fill(HIST("histTpcNsigmaData"), track.pt(), nSigmaProton);
         deuteron_reg.fill(HIST("histTpcNsigmaData"), track.pt(), nSigmaDeut);
         Helium3_reg.fill(HIST("histTpcNsigmaData"), track.pt() * 2.0, nSigmaHe3);
-        spectra.fill(HIST("histDcaVsPtData_particle"), track.pt(), track.dcaXY());
-        spectra.fill(HIST("histDcaZVsPtData_particle"), track.pt(), track.dcaZ());
         /*
                 if (track.centFV0A() > 0.0 && track.centFV0A() < 5.0) {
                   proton_erg.fill(HIST("histTpcNsigmaData_cent_0-5"), track.pt(), nSigmaProton);
@@ -329,8 +363,6 @@ struct NucleiHistTask {
         aproton_erg.fill(HIST("histTpcNsigmaData"), track.pt(), nSigmaProton);
         adeuteron_reg.fill(HIST("histTpcNsigmaData"), track.pt(), nSigmaDeut);
         aHelium3_reg.fill(HIST("histTpcNsigmaData"), track.pt() * 2.0, nSigmaHe3);
-        spectra.fill(HIST("histDcaVsPtData_antiparticle"), track.pt(), track.dcaXY());
-        spectra.fill(HIST("histDcaZVsPtData_antiparticle"), track.pt(), track.dcaZ());
         /*
                 if (track.centFV0A() > 0.0 && track.centFV0A() < 5.0) {
                   aproton_erg.fill(HIST("histTpcNsigmaData_cent_0-5"), track.pt(), nSigmaProton);
@@ -564,7 +596,6 @@ struct NucleiHistTask {
           track.passedITSChi2NDF(),
           track.passedTPCChi2NDF(),
           track.passedITSNCls(),
-          track.passedTPCNCls(),
           0.,
           0.,
           0.,