Added nag by machine, all tests passing