Moved. I also rewrote it using uncombine/combine methods