BUG: forgot r21 and r24
ENH: papers in preparation