More energies implemented