diff --git a/R/blackBoxDS.R b/R/blackBoxDS.R
index 8e7e33f1..a2ac1efc 100644
--- a/R/blackBoxDS.R
+++ b/R/blackBoxDS.R
@@ -67,8 +67,11 @@ blackBoxDS <- function(input.var.name=NULL,
   ########################################################
   
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
 
  input.var <- eval(parse(text=input.var.name), envir = parent.frame())
  
diff --git a/R/blackBoxRanksDS.R b/R/blackBoxRanksDS.R
index cb2fc21f..27a85778 100644
--- a/R/blackBoxRanksDS.R
+++ b/R/blackBoxRanksDS.R
@@ -62,8 +62,11 @@ blackBoxRanksDS <- function(input.var.name=NULL, shared.seedval){ #START FUNC
   ########################################################
 
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
 
 input.var <- eval(parse(text=input.var.name), envir = parent.frame())
 input.global.ranks<-input.var
diff --git a/R/global.R b/R/global.R
index 89970bc0..302a35b1 100644
--- a/R/global.R
+++ b/R/global.R
@@ -2,5 +2,5 @@
 
 utils::globalVariables(c('offset.to.use', 'weights.to.use', 'out.table.real', 'out.table.dim', 'out.table.dimnames', 'list.obj', 'mg',
                          'blackbox.output.df', 'blackbox.ranks.df', 'global.bounds.df', 'global.ranks.quantiles.df', 'sR4.df',
-                         'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed', 'x','y'))
+                         'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed','x','y','.Random.seed'))
 
diff --git a/R/heatmapPlotDS.R b/R/heatmapPlotDS.R
index 6dccbd5b..68302392 100644
--- a/R/heatmapPlotDS.R
+++ b/R/heatmapPlotDS.R
@@ -39,8 +39,11 @@ heatmapPlotDS <- function(x, y, k, noise, method.indicator){
   ###################################################################
   
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
   
   # Cbind the columns of the two variables and remove any rows that include NAs
   data.table <- cbind.data.frame(x, y)
diff --git a/R/histogramDS1.R b/R/histogramDS1.R
index a79d2f52..c5f68d41 100644
--- a/R/histogramDS1.R
+++ b/R/histogramDS1.R
@@ -37,8 +37,11 @@ histogramDS1 <- function(xvect, method.indicator, k, noise){
   ##################################################################
   
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
   
   # print an error message if the input vector is not a numeric
   if(!(is.numeric(xvect))){
diff --git a/R/histogramDS2.R b/R/histogramDS2.R
index 1f7a8acc..cffed190 100644
--- a/R/histogramDS2.R
+++ b/R/histogramDS2.R
@@ -39,8 +39,11 @@ histogramDS2 <- function (xvect, num.breaks, min, max, method.indicator, k, nois
   ##################################################################
   
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
   
   if (method.indicator==1){
 
diff --git a/R/minMaxRandDS.R b/R/minMaxRandDS.R
index 0346eb75..e6ccfc82 100644
--- a/R/minMaxRandDS.R
+++ b/R/minMaxRandDS.R
@@ -21,8 +21,11 @@
 minMaxRandDS <- function(input.var.name){ #START FUNC
   
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
   
   input.var <- eval(parse(text=input.var.name), envir = parent.frame())
 
diff --git a/R/rangeDS.R b/R/rangeDS.R
index 6cf7689c..9c391b69 100644
--- a/R/rangeDS.R
+++ b/R/rangeDS.R
@@ -9,8 +9,11 @@
 #'
 rangeDS <- function(xvect) {
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
 
   # print an error message if the input vector is not a numeric
   if (!(is.numeric(xvect))) {
diff --git a/R/scatterPlotDS.R b/R/scatterPlotDS.R
index bf229041..62fbc6a6 100644
--- a/R/scatterPlotDS.R
+++ b/R/scatterPlotDS.R
@@ -44,8 +44,11 @@ scatterPlotDS <- function(x, y, method.indicator, k, noise){
   ###################################################################
   
   # back-up current .Random.seed and revert on.exit
-  old_seed <- .Random.seed
-  on.exit(.Random.seed <- old_seed, add = TRUE)
+  if (exists(x = ".Random.seed", envir = globalenv())) {
+      assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
+      on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
+  } else
+      on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
   
   # Cbind the columns of the two variables and remove any rows that include NAs
   data.table <- cbind.data.frame(x, y)
diff --git a/R/zzz.R b/R/zzz.R
deleted file mode 100644
index 6586ae7c..00000000
--- a/R/zzz.R
+++ /dev/null
@@ -1,20 +0,0 @@
-ENV <- new.env()
-
-.onLoad = function(libname, pkgname) {
-  
-  #### !!! If making changes, update: .onLoad(), set_opts(), show_opts(), .check_options()
-  
-  options(
-    datashield.privacyLevel = 5, 
-    default.datashield.privacyControlLevel = "banana", 
-    default.nfilter.glm = 0.33, 
-    default.nfilter.kNN = 3, 
-    default.nfilter.string = 80, 
-    default.nfilter.subset = 3, 
-    default.nfilter.stringShort = 20, 
-    default.nfilter.tab = 3, 
-    default.nfilter.noise = 0.25, 
-    default.nfilter.levels.density = 0.33, 
-    default.nfilter.levels.max = 40
-  )
-}
\ No newline at end of file
diff --git a/inst/DATASHIELD b/inst/DATASHIELD
index ab654bea..27dcb7e7 100644
--- a/inst/DATASHIELD
+++ b/inst/DATASHIELD
@@ -162,4 +162,14 @@ AssignMethods:
     sum=base::sum,
     unlist=base::unlist
 Options:
-    testoption=100
+    datashield.privacyLevel=5,
+    default.datashield.privacyControlLevel="banana",
+    default.nfilter.glm=0.33,
+    default.nfilter.kNN=3,
+    default.nfilter.string=80,
+    default.nfilter.subset=3,
+    default.nfilter.stringShort=20,
+    default.nfilter.tab=3,
+    default.nfilter.noise=0.25,
+    default.nfilter.levels.density=0.33,
+    default.nfilter.levels.max=40
\ No newline at end of file