Added stuff for the energy bar
merge