diff --git a/Rakefile b/Rakefile
index 4e736b6998..adb1a8d143 100644
--- a/Rakefile
+++ b/Rakefile
@@ -165,10 +165,32 @@ task :cde do
   sh "make";
   Dir.chdir "..";
   puts "\nCreating CDE Package...\n";
-  sh "./CDE/cde ruby beef";
-  sleep (1);
+  sh "bundle install"
+  Rake::Task['cde_beef_start'].invoke
+  Rake::Task['beef_stop'].invoke
   puts "\nCleaning Up...\n";
-  sh "rm -r CDE";
+  sleep (2);	
+  sh "rm -rf CDE";
   puts "\nCDE Package Created...\n";
  end
 
+################################
+# CDE/BeEF environment set up
+
+@beef_process_id = nil;
+
+task :cde_beef_start => 'beef' do
+  printf "Starting CDE BeEF (wait 10 seconds)..."
+  @beef_process_id = IO.popen("./CDE/cde ruby beef -x 2> /dev/null", "w+")
+  delays = [2, 2, 1, 1, 1, 0.5, 0.5 , 0.5, 0.3, 0.2, 0.1, 0.1, 0.1, 0.05, 0.05]
+  delays.each do |i| # delay for 10 seconds
+    printf '.'
+    sleep (i)
+  end
+  puts '.'
+end
+
+
+################################
+
+