Refactored parity