I would add flexible demand response sw/hw and long duration energy storage