New Sampler State logic added. Still to be tested