Refactored newly merged findings.