Further refinements to sample states as requested