initial effective calculation - Q3720 & Q3730
Merge remote-tracking branch 'origin/master'