6/8 - 💛 FAT 💛 optimization

💛 FAT 💛 optimization (6/8) - Franck Bué

💛 FAT 💛 optimization