added normal mode stuff, energy transfer stuff