diff --git a/rlwe/examples/encryption.rs b/rlwe/examples/encryption.rs
index eb4e323..40397f4 100644
--- a/rlwe/examples/encryption.rs
+++ b/rlwe/examples/encryption.rs
@@ -34,11 +34,11 @@ fn main() {
 
     want.iter_mut().enumerate().for_each(|(i, x)| *x = i as i64);
 
-    let mut pt: Plaintext = params.new_plaintext(params.log_q() - 20);
+    let mut pt: Plaintext = params.new_plaintext(params.log_q());
 
     let log_base2k = pt.log_base2k();
 
-    let log_k: usize = 17;
+    let log_k: usize = params.log_q() - 20;
 
     pt.0.value[0].encode_vec_i64(log_base2k, log_k, &want, 32);
     pt.0.value[0].normalize(log_base2k, &mut tmp_bytes);
diff --git a/rlwe/examples/gadget_product.rs b/rlwe/examples/gadget_product.rs
new file mode 100644
index 0000000..40397f4
--- /dev/null
+++ b/rlwe/examples/gadget_product.rs
@@ -0,0 +1,77 @@
+use base2k::{Encoding, FFT64, SvpPPolOps};
+use rlwe::{
+    ciphertext::Ciphertext,
+    decryptor::{Decryptor, decrypt_rlwe_thread_safe_tmp_byte},
+    encryptor::{EncryptorSk, encrypt_rlwe_sk_tmp_bytes},
+    keys::SecretKey,
+    parameters::{Parameters, ParametersLiteral},
+    plaintext::Plaintext,
+};
+use sampling::source::{Source, new_seed};
+
+fn main() {
+    let params_lit: ParametersLiteral = ParametersLiteral {
+        log_n: 10,
+        log_q: 54,
+        log_p: 0,
+        log_base2k: 17,
+        log_scale: 20,
+        xe: 3.2,
+        xs: 128,
+    };
+
+    let params: Parameters = Parameters::new::<FFT64>(&params_lit);
+
+    let mut tmp_bytes: Vec<u8> = vec![
+        0u8;
+        params.decrypt_rlwe_thread_safe_tmp_byte(params.log_q())
+            | params.encrypt_rlwe_sk_tmp_bytes(params.log_q())
+    ];
+
+    let sk: SecretKey = SecretKey::new(params.module());
+
+    let mut want = vec![i64::default(); params.n()];
+
+    want.iter_mut().enumerate().for_each(|(i, x)| *x = i as i64);
+
+    let mut pt: Plaintext = params.new_plaintext(params.log_q());
+
+    let log_base2k = pt.log_base2k();
+
+    let log_k: usize = params.log_q() - 20;
+
+    pt.0.value[0].encode_vec_i64(log_base2k, log_k, &want, 32);
+    pt.0.value[0].normalize(log_base2k, &mut tmp_bytes);
+
+    println!("log_k: {}", log_k);
+    pt.0.value[0].print_limbs(pt.limbs(), 16);
+
+    let mut ct: Ciphertext = params.new_ciphertext(params.log_q());
+
+    let mut source_xe: Source = Source::new(new_seed());
+    let mut source_xa: Source = Source::new(new_seed());
+
+    let mut sk_svp_ppol: base2k::SvpPPol = params.module().svp_new_ppol();
+    params.module().svp_prepare(&mut sk_svp_ppol, &sk.0);
+
+    params.encrypt_rlwe_sk_thread_safe(
+        &mut ct,
+        Some(&pt),
+        &sk_svp_ppol,
+        &mut source_xa,
+        &mut source_xe,
+        &mut tmp_bytes,
+    );
+
+    params.decrypt_rlwe_thread_safe(&mut pt, &ct, &sk_svp_ppol, &mut tmp_bytes);
+
+    pt.0.value[0].print_limbs(pt.limbs(), 16);
+
+    let mut have = vec![i64::default(); params.n()];
+
+    println!("pt: {}", log_k);
+    pt.0.value[0].decode_vec_i64(pt.log_base2k(), log_k, &mut have);
+
+    println!("want: {:?}", &want[..16]);
+    println!("have: {:?}", &have[..16]);
+}
diff --git a/rlwe/src/key_generator.rs b/rlwe/src/key_generator.rs
index 958db6a..00710ba 100644
--- a/rlwe/src/key_generator.rs
+++ b/rlwe/src/key_generator.rs
@@ -1,3 +1,4 @@
+use crate::encryptor::encrypt_grlwe_sk_thread_safe;
 use crate::keys::{PublicKey, SecretKey, SwitchingKey};
 use crate::parameters::Parameters;
 use base2k::SvpPPol;
@@ -38,16 +39,20 @@ impl KeyGenerator {
         pk
     }
 
-    pub fn gen_switching_key(
+    pub fn gen_switching_key_thread_safe(
         &self,
         params: &Parameters,
         sk_in: &SecretKey,
         sk_out: &SecretKey,
         rows: usize,
         log_q: usize,
+        tmp_bytes: &mut [u8],
     ) -> SwitchingKey {
-        let swk = SwitchingKey::new(params.module(), params.log_base2k(), rows, log_q, 0);
+        let swk: SwitchingKey = SwitchingKey::new(params.module(), params.log_base2k(), rows, log_q, 0);
 
+        let module: &base2k::Module = params.module();
+
+        encrypt_grlwe_sk_thread_safe(module, swk.0, &sk_in.0, sk_out, source_xa, source_xe, sigma, tmp_bytes);
         swk
     }
 }