Improved calculations