Add group numbers and increase efficiency.
Add calculator from previous day.
Merge remote-tracking branch 'upstream/master'
added version2