Updated hard-coded calculations