Making fadi-in awesomer :sparkles: