updates to energy decomposition