entity calculator updated