A hair conditioning composition comprising by weight: (a) from 0.1 % to 20% of a silicone system comprising: (i) a first silicone which is non-volatile, substantially free of amino groups, and has a viscosity of from 100,000 mm 2 ·s -1 to 30,000,000 mm 2 ·s -1; (ii) a second silicone which is non-volatile, substantially free of amino groups, and has a viscosity of from 5 mm 2 ·s -1 to 10,000 mm 2 ·s -1; and (iii) a third silicone which is an aminosilicone having a viscosity of from 100 mm 2 ·s -1 to 50,000 mm 2 ·s -1; (b) a gel matrix comprising: (i) from 0.1% to 10% of an cationic surfactant having the following general formula: wherein one of R 71, R 72, R 73 and R 74 is selected from an aliphatic group of from 16 to 30 carbon atoms or an aromatic, alkoxy, polyoxyalkylene, alkylamido, hydroxyalkyl, aryl or alkylaryl group having up to about 30 carbon atoms; the remainder of R 71, R 72, R 73 and R 74 are independently selected from an aliphatic group of from 1 to about 8 carbon atoms or an aromatic, alkoxy, polyoxyalkylene, alkylamido, hydroxyalkyl, aryl or alkylaryl group having up to about 8 carbon atoms; and X - is a salt-forming anion such as those selected from halogen, ( e.g. chloride, bromide), acetate, citrate, lactate, glycolate, phosphate, nitrate, sulfonate, sulfate, alkylsulfate, and alkyl sulfonate radicals; (ii) from 0.1% to 20% of a high melting point fatty compound; and (iii) an aqueous carrier; wherein the composition is prepared by a method comprising the steps of: (a) mixing the first, second, and third silicones to form the silicone system; and (b) mixing the silicone system with the gel matrix. (a) from 0.1 % to 20% of a silicone system comprising: (i) a first silicone which is non-volatile, substantially free of amino groups, and has a viscosity of from 100,000 mm 2 ·s -1 to 30,000,000 mm 2 ·s -1; (ii) a second silicone which is non-volatile, substantially free of amino groups, and has a viscosity of from 5 mm 2 ·s -1 to 10,000 mm 2 ·s -1; and (iii) a third silicone which is an aminosilicone having a viscosity of from 100 mm 2 ·s -1 to 50,000 mm 2 ·s -1; (i) a first silicone which is non-volatile, substantially free of amino groups, and has a viscosity of from 100,000 mm 2 ·s -1 to 30,000,000 mm 2 ·s -1; (ii) a second silicone which is non-volatile, substantially free of amino groups, and has a viscosity of from 5 mm 2 ·s -1 to 10,000 mm 2 ·s -1; and (iii) a third silicone which is an aminosilicone having a viscosity of from 100 mm 2 ·s -1 to 50,000 mm 2 ·s -1; (b) a gel matrix comprising: (i) from 0.1% to 10% of an cationic surfactant having the following general formula: wherein one of R 71, R 72, R 73 and R 74 is selected from an aliphatic group of from 16 to 30 carbon atoms or an aromatic, alkoxy, polyoxyalkylene, alkylamido, hydroxyalkyl, aryl or alkylaryl group having up to about 30 carbon atoms; the remainder of R 71, R 72, R 73 and R 74 are independently selected from an aliphatic group of from 1 to about 8 carbon atoms or an aromatic, alkoxy, polyoxyalkylene, alkylamido, hydroxyalkyl, aryl or alkylaryl group having up to about 8 carbon atoms; and X - is a salt-forming anion such as those selected from halogen, ( e.g. chloride, bromide), acetate, citrate, lactate, glycolate, phosphate, nitrate, sulfonate, sulfate, alkylsulfate, and alkyl sulfonate radicals; (ii) from 0.1% to 20% of a high melting point fatty compound; and (iii) an aqueous carrier; (i) from 0.1% to 10% of an cationic surfactant having the following general formula: wherein one of R 71, R 72, R 73 and R 74 is selected from an aliphatic group of from 16 to 30 carbon atoms or an aromatic, alkoxy, polyoxyalkylene, alkylamido, hydroxyalkyl, aryl or alkylaryl group having up to about 30 carbon atoms; the remainder of R 71, R 72, R 73 and R 74 are independently selected from an aliphatic group of from 1 to about 8 carbon atoms or an aromatic, alkoxy, polyoxyalkylene, alkylamido, hydroxyalkyl, aryl or alkylaryl group having up to about 8 carbon atoms; and X - is a salt-forming anion such as those selected from halogen, ( e.g. chloride, bromide), acetate, citrate, lactate, glycolate, phosphate, nitrate, sulfonate, sulfate, alkylsulfate, and alkyl sulfonate radicals; (ii) from 0.1% to 20% of a high melting point fatty compound; and (iii) an aqueous carrier; (a) mixing the first, second, and third silicones to form the silicone system; and (b) mixing the silicone system with the gel matrix.