diff --git a/manifests/cheaha_users.pp b/manifests/cheaha_users.pp
index ccf8ccdf4f371ace97dc7cd9bfae684351008e44..c9653e728f8fb756490a9aa34fc3ccf38de410d9 100644
--- a/manifests/cheaha_users.pp
+++ b/manifests/cheaha_users.pp
@@ -244,7 +244,6 @@ class users::cheaha_users inherits users::virtual_users
     User["dsf"],
     User["dsicking"],
     User["dspace"],
-    User["dszeiger"],
     User["dtchen"],
     User["dvkini"],
     User["dylan922"],
diff --git a/manifests/mephisto_users.pp b/manifests/mephisto_users.pp
index 150091763c7e0ccf85e4690f8c45fd2cb8dc7500..02f1532454e3f2700d37ffa00dc32554a7f3fd96 100644
--- a/manifests/mephisto_users.pp
+++ b/manifests/mephisto_users.pp
@@ -22,55 +22,59 @@ class users::mephisto_users inherits users::virtual_users
       )
     }
     "me-fwd1": {
-       User["fdorothy"]        { home   => "/home.local/fdorothy" }
-       realize(
-          Group["me"],
-          Group["etlab"],
-          User["fdorothy"]
-       )
-     }
-     "me-dhr1": {
-       realize(
-          Group["me"],
-          Group["etlab"],
-          User["dhross"]
-       )
-     }
-     "me-h330la": {
-       User["skulathu"]        { home   => "/home.local/skulathu" }
-       realize(
-          Group["me"],
-          User["skulathu"]
-       )
-     }
-     "me-bec352lb": {
-       User["amitesh"]        { home   => "/home.local/amitesh" }
-       User["adgranvi"]       { home   => "/home.local/adgranvi" }
-       User["ndgray"]         { home   => "/home.local/ndgray" }
-       realize(
-          Group["me"],
-          Group["etlab"],
-          User["amitesh"],
-          User["adgranvi"],
-          User["ashih"],
+      User["fdorothy"]        { home   => "/home.local/fdorothy" }
+      realize(
+        Group["me"],
+        Group["etlab"],
+        User["fdorothy"]
+      )
+    }
+    "me-dhr1": {
+      realize(
+        Group["me"],
+        Group["etlab"],
+        User["dhross"]
+      )
+    }
+    "me-h330la": {
+      User["skulathu"]        { home   => "/home.local/skulathu" }
+      realize(
+        Group["me"],
+        User["skulathu"]
+      )
+    }
+    "me-bec352lb": {
+      User["amitesh"]        { home   => "/home.local/amitesh" }
+      User["adgranvi"]       { home   => "/home.local/adgranvi" }
+      User["ndgray"]         { home   => "/home.local/ndgray" }
+      realize(
+        Group["me"],
+        Group["etlab"],
+        User["amitesh"],
+        User["adgranvi"],
+        User["ashih"],
           User["ndgray"]
-       )
-     }
-     "me-rpk2": {
-       realize(
-          Group["me"],
-          User["roy"]
-       )
-     }
+      )
+    }
+    "me-rpk2": {
+      realize(
+        Group["me"],
+        User["roy"]
+      )
+    }
 
     default: {
+      User["dszeiger"]       { gid => ["dszeiger"], groups +> ["me"] }
       User["gmyers"]         { gid => ["gmyers"],   groups +> ["me"] }
       User["harongjr"]       { gid => ["harongjr"], groups +> ["me"] }
+      User["khin9916"]       { gid => ["khin9916"], groups +> ["me"] }
       User["kmelliso"]       { gid => ["kmelliso"], groups +> ["me"] }
       User["kschrum"]        { gid => ["kschrum"],  groups +> ["me"] }
       User["miskosr"]        { gid => ["miskosr"],  groups +> ["me"] }
       User["mmullane"]       { gid => ["mmullane"], groups +> ["me"] }
       User["rafaelc"]        { gid => ["rafaelc"],  groups +> ["me"] }
+      User["tbarrios"]       { gid => ["tbarrios"], groups +> ["me"] }
+      User["wiyyum"]         { gid => ["wiyyum"],   groups +> ["me"] }
 
       # Add shum and dino-theodorou to group citronelle
       User["sam9412"]        { gid    => ["sam9412"], groups => ["etlab"] }
@@ -145,6 +149,8 @@ class users::mephisto_users inherits users::virtual_users
         User["dhross"],
         User["dillavou"],
         User["dll"],
+        User["dszeiger"],
+        Group["dszeiger"],
         User["dvkini"],
         User["dwb0126"],
         User["echenne"],
@@ -175,6 +181,8 @@ class users::mephisto_users inherits users::virtual_users
         User["kbfarley"],
         User["kdn"],
         User["ketaki"],
+        User["khin9916"],
+        Group["khin9916"],
         User["kj878"],
         User["kmanne09"],
         User["kmelliso"],
@@ -222,11 +230,15 @@ class users::mephisto_users inherits users::virtual_users
         User["stuartm"],
         Group["stuartm"],
         User["stuicism"],
+        User["tbarrios"],
+        Group["tbarrios"],
         User["therohit"],
         User["tuptain"],
         User["waltchen"],
         User["wenbin"],
         User["whz"],
+        User["wiyyum"],
+        Group["wiyyum"],
         User["wytemike"],
         User["yito"],
         User["ykim"],
diff --git a/manifests/virtual_groups.pp b/manifests/virtual_groups.pp
index 35b6f68b0126aaf3c5e304087a716a1ede0f964c..3b51b46fad64d553ba38ec69f54c2524ca217601 100644
--- a/manifests/virtual_groups.pp
+++ b/manifests/virtual_groups.pp
@@ -2261,5 +2261,17 @@ class users::virtual_groups
     gid     => "10616",
     ensure  => "present",
   }
+  @group { "khin9916":
+    gid     => "10617",
+    ensure  => "present",
+  }
+  @group { "tbarrios":
+    gid     => "10618",
+    ensure  => "present",
+  }
+  @group { "wiyyum":
+    gid     => "10619",
+    ensure  => "present",
+  }
 
 }
diff --git a/manifests/virtual_users.pp b/manifests/virtual_users.pp
index f999e9e290c44133291ced14263121db8de0f331..90b3f3689a996471e71e63f9acfcd9907a70421c 100644
--- a/manifests/virtual_users.pp
+++ b/manifests/virtual_users.pp
@@ -4116,14 +4116,16 @@ class users::virtual_users
     expiry     => "2013-06-01",
   }
   # 20130307 - Added new cheaha user dszeiger for Spring 2013 ME 464/564 - https://trac.uabgrid.uab.edu/atlab/ticket/572
+  # 20141009 - Mephisto user for running StarCCM for Roy's CFD class - https://trac.eng.uab.edu/enghpc/ticket/591
   @user { "dszeiger":
     ensure     => "present",
     uid        => "10383",
     gid        => "me",
-    comment    => "Douglas Shook Zeiger, dszeiger@uab.edu, ME, Jong-Eun Kim (jkim@uab.edu)",
-    managehome => false,
+    comment    => "Douglas Shook Zeiger, dszeiger@uab.edu, ME, Roy Koomullil (rkoomul@uab.edu)",
+    managehome => true,
     #expiry     => "2013-06-01",
-    expiry     => "2014-06-01",
+    #expiry     => "2014-06-01",
+    expiry     => "absent",
   }
   # 20130307 - Added new cheaha user gjudd for Spring 2013 ME 464/564 - https://trac.uabgrid.uab.edu/atlab/ticket/572
   # 20140827 - Added new cheaha user gjudd - https://trac.uabgrid.uab.edu/atlab/ticket/828
@@ -5991,7 +5993,7 @@ class users::virtual_users
     comment    => "Christopher E Arias, cearias@uab.edu, CIVIL, Nasim Uddin (nuddin@uab.edu)",
     managehome => true,
   }
-  # 20141007 - Added new ENG user yildirim possible future Cheaha user - 
+  # 20141007 - Added new ENG user yildirim possible future Cheaha user -
   @user { "yildirim":
     ensure     => "present",
     uid        => "10613",
@@ -5999,7 +6001,7 @@ class users::virtual_users
     comment    => "Abidin Yildirim, yildirim@uab.edu, EE, Abidin Yildirim (yildirim@uab.edu)",
     managehome => true,
   }
-  # 20141007 - Added new ENG user rafaelc possible future Cheaha user - 
+  # 20141007 - Added new ENG user rafaelc possible future Cheaha user -
   @user { "rafaelc":
     ensure     => "present",
     uid        => "10614",
@@ -6007,7 +6009,7 @@ class users::virtual_users
     comment    => "Rafael T Correa, rafaelc@uab.edu, ME, Corey Shum (shum@uab.edu)",
     managehome => true,
   }
-  # 20141007 - Added new ENG user miskosr possible future Cheaha user - 
+  # 20141007 - Added new ENG user miskosr possible future Cheaha user -
   @user { "miskosr":
     ensure     => "present",
     uid        => "10615",
@@ -6023,5 +6025,29 @@ class users::virtual_users
     comment    => "George C Dobbins, gclemd@uab.edu, PEDID, Shannon Ross (sacton@uab.edu)",
     managehome => true,
   }
+  # 20141009 - Mephisto user for running StarCCM for Roy's CFD class - https://trac.eng.uab.edu/enghpc/ticket/591
+  @user { "khin9916":
+    ensure     => "present",
+    uid        => "10617",
+    gid        => "me",
+    comment    => "Kevin N Hinote, khin9916@uab.edu, ME, Roy Koomullil (rkoomul@uab.edu)",
+    managehome => true,
+  }
+  # 20141009 - Mephisto user for running StarCCM for Roy's CFD class - https://trac.eng.uab.edu/enghpc/ticket/591
+  @user { "tbarrios":
+    ensure     => "present",
+    uid        => "10618",
+    gid        => "me",
+    comment    => "Tjana S Barrios, tbarrios@uab.edu, ME, Roy Koomullil (rkoomul@uab.edu)",
+    managehome => true,
+  }
+  # 20141009 - Mephisto user for running StarCCM for Roy's CFD class - https://trac.eng.uab.edu/enghpc/ticket/591
+  @user { "wiyyum":
+    ensure     => "present",
+    uid        => "10619",
+    gid        => "me",
+    comment    => "William Percy Price, wiyyum@uab.edu, ME, Roy Koomullil (rkoomul@uab.edu)",
+    managehome => true,
+  }
 
 }