implemented control over energy requirements, for #1664