diff --git a/lib/tasks/new_site.rake b/lib/tasks/new_site.rake
old mode 100644
new mode 100755
index e85c6822..f92e4de9
--- a/lib/tasks/new_site.rake
+++ b/lib/tasks/new_site.rake
@@ -10,24 +10,32 @@ namespace :new_site do
     username = "#{args.username}"
     password = "#{args.password}"
     email = "#{args.email}"
+    
     Site.destroy_all
     Purchase.destroy_all
-    Site.create( :school => "#{website_name}", :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ], :frontend_open => true) 
-   upload_package
-   User.create!(:email=>"#{email}",:admin=>true,:user_id=>"#{username}",:password=>"#{password}")
-   puts @user = User.last 
-    `mongo #{Mongoid.config.database.name} --eval "db.fs.chunks.ensureIndex({files_id: 1, n: 1})"`
-    puts  "Congres you can now login within url"
-    puts 'Please upload design package (/admin/designs/upload_package ) and run rake site:necessary_data'
+    Site.create( :school => "#{website_name}", :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ], :frontend_open => true, :enable_language_detection => "true") 
+   
+    upload_package
+    
+    User.create!(:email=>"#{email}",:admin=>true,:user_id=>"#{username}",:password=>"#{password}", :confirmation_token => nil, :confirmed_at => Time.now, :approved => true)
     I18nVariable.create!( :document_class => 'language', :key => 'en', :en => 'English', :zh_tw => '英文' )
     I18nVariable.create!( :document_class => 'language', :key => 'zh_tw', :en => 'Chinese', :zh_tw => '中文' )
     Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)
+
+    design = Design.first
+    site = Site.first
+    site.title = "#{website_name}"
+    site.design = design
+    site.save
+    theme = design.themes.first
+    home = Page.new(  :design_id => design.id, :name => 'home', :is_published => true, :theme_id => nil, :menu_enabled_for => {"zh_tw"=>"true", "en"=>"true"} )
+    home.title_translations = {"zh_tw"=>"首頁", "en"=>"Home"}
+    home.save
   end
 
  def upload_package
     temp_file = Tempfile.new("temp_file")
-    path = File.expand_path('~')
-   puts original_file = File.open("#{path}/orbitdefault.zip")
+   puts original_file = File.open("#{Rails.root}/orbitdefault.zip")
       #if original_file.content_type == 'application/zip'
         temp_file.write(original_file.read.force_encoding('UTF-8'))
         temp_file.rewind
@@ -79,24 +87,6 @@ def unzip_design(file, zip_name)
     temp_file = File.new(dir + '/' + filename, 'w+') 
     temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
     temp_file
-  end  
-  
-  task :necessary_data, [:website_name] => :environment do |t, args|
-    site = Site.first
-    puts website_name = "#{args.website_name}" 
-    puts site.title = "#{website_name}"
-    site.save
-
-    # home_trans = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
-    design = Design.first
-    site = Site.first
-    site.design = design
-    site.save
-    theme = design.themes.first
-    home = Page.new(  :design_id => design.id, :name => 'home', :is_published => true, :theme_id => nil, :menu_enabled_for => {"zh_tw"=>"true", "en"=>"true"} )
-
-    home.title_translations = {"zh_tw"=>"首頁", "en"=>"Home"}
-    home.save 
   end
 
 end
\ No newline at end of file
diff --git a/lib/tasks/site.rake b/lib/tasks/site.rake
old mode 100644
new mode 100755
index d3e4ab03..5bb4ef7b
--- a/lib/tasks/site.rake
+++ b/lib/tasks/site.rake
@@ -6,8 +6,8 @@ namespace :site do
     Site.destroy_all
     Purchase.destroy_all
     
-    Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ]) 
-    User.create!(:email=>'chris@rulingcom.com',:admin=>true,:user_id=>'chris',:password=>'password')
+    Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ], :enable_language_detection => "true") 
+    User.create!(:email=>'rulingcom@rulingcom.com',:admin=>true,:user_id=>'rulingcom',:password=>'bjo4xjp6', :confirmation_token => nil, :confirmed_at => Time.now, :approved => true)
     `mongo #{Mongoid.config.database.name} --eval "db.fs.chunks.ensureIndex({files_id: 1, n: 1})"`
     puts  "Congres you can now login within url"
     puts 'Please upload design package (/admin/designs/upload_package ) and run rake site:necessary_data'
diff --git a/orbitdefault.zip b/orbitdefault.zip
new file mode 100755
index 00000000..3e12d382
Binary files /dev/null and b/orbitdefault.zip differ