Improvements
Tuning for non-repeating samples: but takes long time