diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index e55df129f..12e8f6b14 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -121,15 +121,16 @@
   command: npm install    # slightly safer than "shell:"
   args:
     chdir: "{{ sugarizer_location }}/{{  sugarizer_server_version }}"
-#   creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules"    # OLD WAY 2
-# when: git_sug_server_output.changed    # OLD WAY 3
-# when: not is_F18 and not node_modules_exists    # OLD WAY 1
+    #creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules"    # OLD WAY 2
+  when: internet_available    # "npm install" generally requires Internet access
+# when: internet_available and git_sug_server_output.changed    # OLD WAY 3
+# when: internet_available and not is_F18 and not node_modules_exists    # OLD WAY 1
 
 #- name: Create the express framework for Node.js (Fedora 18)
 #  shell: npm install
 #  args:
 #    chdir: "{{ sugarizer_location }}/sugarizer/server"
-#  when: is_F18 and not node_modules_exists
+#  when: internet_available and is_F18 and not node_modules_exists
 
 # 5. PLACE CONFIG FILES
 
@@ -141,9 +142,9 @@
     owner: root
     group: root
   with_items:
-    - { src: 'sugarizer.service.j2', dest: '/etc/systemd/system/sugarizer.service', mode: '0644' }
     - { src: 'sugarizer.ini', dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini', mode: '0644' }
     - { src: 'sugarizer.conf', dest: '/etc/apache2/sites-available', mode: '0644' }
+    - { src: 'sugarizer.service.j2', dest: '/etc/systemd/system/sugarizer.service', mode: '0644' }
 
 - name: Create symlink for short URL http://box/sugarizer
   file: