Improve calc total
Merge remote-tracking branch 'origin/finals'