Shane's paper. Includes a change for Inkoo's old paper.