initial effective calculation - Q3750
Merge remote-tracking branch 'origin/master'