Mod: Update from Bilal from Luc and Min.