Energy 6.2 and 6.9

Review