Updates on calculation