FAT refactor