I'll see if I can come up with an alternate PR shortly.