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