Added TM
Updated NS