always optimizing and reorganizing
all the methods added with the energy update are now appropriately placed with the energy methods