attempt to optimize the easy parts of billing run, RT#18737