Refactored to avoid insight warnings