Added bin/ndfs again...