Title: Modernizing the Surveillance Mandate and Modalities