ELECTRICITY STORAGE IN A REDESIGNED MARKET