Updated DiffSampling and NSampling

Final working implementation