commit before moving to energy_rejection branch