Cleaned up NM model