Changed generator to public