Updated calculation