Update - more detailed calculations