Improve the tool to subsume previous fs info.