Under new energy plan, markets to be closed by 8:30pm