changed sample generation of Salt to SampleGenerator