fid after refactoring