added energy stuff