More work on precompute