NMF - TA and Bathe updates