more changes to generator