Re-org for logical errors.