Primary energy ok
Minor merge