added energy types
removed broadcast, reduced columns