change api to line up with nfd module + password