Revision of all calculations