anmn_nrs_rt_wave_2

Please review. This branch addresses former branch issue of having unnecessary commits.