changes from ilium on Wed Apr 23 10:00:16 EDT 2014