Improving the Electricity Market Design for a Decarbonised and Sustainable Energy System (1)