* simplification patch by Jeffrey Ryan Muizelaar