changes from ilium on Wed Apr 23 16:13:58 EDT 2014