modified calc formula
compare utility
Merge branch 'project2'