updated diff calcs from Atrides branch