Refactored in pnwbutterflies