modified calc formula
Merge branch 'project2'