Added detailed calculations and data