implemented energy and power
fixed conflicts