updated with new NAF library