initial effective calculation - 3610, 3620, 3630
Merge remote-tracking branch 'origin/master'