revert to File Manager in HK summit + changes