adding in Justins calculationspec