Updates to results calculations