Updates to energy scripts