Added better sampling.