Small changes to recompute