Reformed electricity market design rules