Big changes

generator updates