added energy and other things