wip on adapting to nfs change