Amit Shah focuses on new doctrine to fight terror & radicalisation