Ported over to the new fay 0.13 code