Added sampler fully working