Another update to generator