Update of EOT calculation and additional functions