CIRs looking good.  ToAs still need some work