It will now trade electricity generated by any public and private generating companies