Enhancements with feedbacks from Marco, Joffrey, Franck