new afc refactor file