Update to calculations