SIP-42 -> SIP-23