Final fix to NDA/IP