improve for astute generator