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