some progress on the new energy system, for #1578