changes from ilium on Wed Apr 23 12:09:14 EDT 2014