Generator table tweaked