Reordering for easier comparison, adding option to not use NFS