test changes to power calculation
Merge origin/master