updates and added \energy macro