Adding switchable psi sampling.