Reformatting, generator method added