changes in energy calculations + conserved quantities
changes in energy calculations + conserved quantities