Steven Levithan's parseuri upgrade