Aligning the “single law” proposal to the CRPD standard of “will and preferences”