Completed Calculation fixes