Added no-sampling option