Mostly changes to computations for results.