My tidy to finish NMA - with *TESTING*