@timbo now batched in, no longer calculated