MHA reworks NCTC draft