A hair conditioning composition comprising: a) a silicone polymer comprising: i. one or more quaternary groups; ii. at least one silicone block comprising greater than 200 siloxane units; iii. at least one polyalkylene oxide structural unit; and iv. at least one terminal ester group wherein said silicone polymer has a viscosity from 500 to 50,000 mPa.s, measured by means of a glass capillary viscometer as set forth in Dow Corning Corporate Test Method CTM0004, and wherein said silicone polymer is defined by the following chemical structure: M-Y-[-(N + R 2 -T-N + R 2)-Y-] m -[-(NR 2 -A-E-A'-NR 2)-Y-] k -M (Ia) or M-Y-[-(N + R 2 -T-N + R 2)-Y-] m -[-(N + R 2 2 -A-E-A'-N + R 2 2)-Y-] k -M (Ib) wherein: m is an average value of from above 0 to 100 k is an average value of from above 0 to 50 M represents a terminal group, comprising terminal ester groups selected from -OC -Z -OS 2 -Z -OS(O 2)O-Z -OP (O-Z)OH -OP (O-Z) 2 wherein Z is selected from monovalent organic residues having up to 40 carbon atoms, wherein A and A' each are independently selected from a single bond or a divalent organic group having up to 10 carbon atoms and one or more hetero atoms, and E is a polyalkylene oxide group of the general formula: -[CH 2 CH 2 O] q -[CH 2 CH(CH 3)O] r -[CH 2 CH(C 2 H 5)O] s - with q=0 to 200, r=0 to 200, s=0 to 200, and q+r+s = 1 to 600, R is selected from monovalent organic groups having up to 22 carbon atoms, and wherein the free valencies at the nitrogen atoms are bound to carbon atoms, R 2 is selected from hydrogen or R, Y is a group of the formula: -K-S-K- and -A-E-A'- or -A'-E-A-, with S= wherein R 1 = C 1 -C 22 -alkyl, C 1 -C 22 -fluoralkyl or aryl, n=200 to 1000, K is a bivalent or trivalent straight chain, cyclic and/or branched C 2 -C 40 hydrocarbon residue, wherein T is selected from a divalent organic group having up to 20 carbon atoms and one or more hetero atoms; and b) a polymeric thickener. a) a silicone polymer comprising: i. one or more quaternary groups; ii. at least one silicone block comprising greater than 200 siloxane units; iii. at least one polyalkylene oxide structural unit; and iv. at least one terminal ester group wherein said silicone polymer has a viscosity from 500 to 50,000 mPa.s, measured by means of a glass capillary viscometer as set forth in Dow Corning Corporate Test Method CTM0004, and wherein said silicone polymer is defined by the following chemical structure: M-Y-[-(N + R 2 -T-N + R 2)-Y-] m -[-(NR 2 -A-E-A'-NR 2)-Y-] k -M (Ia) or M-Y-[-(N + R 2 -T-N + R 2)-Y-] m -[-(N + R 2 2 -A-E-A'-N + R 2 2)-Y-] k -M (Ib) wherein: m is an average value of from above 0 to 100 k is an average value of from above 0 to 50 M represents a terminal group, comprising terminal ester groups selected from -OC -Z -OS 2 -Z -OS(O 2)O-Z -OP (O-Z)OH -OP (O-Z) 2 wherein Z is selected from monovalent organic residues having up to 40 carbon atoms, wherein A and A' each are independently selected from a single bond or a divalent organic group having up to 10 carbon atoms and one or more hetero atoms, and E is a polyalkylene oxide group of the general formula: -[CH 2 CH 2 O] q -[CH 2 CH(CH 3)O] r -[CH 2 CH(C 2 H 5)O] s - with q=0 to 200, r=0 to 200, s=0 to 200, and q+r+s = 1 to 600, R is selected from monovalent organic groups having up to 22 carbon atoms, and wherein the free valencies at the nitrogen atoms are bound to carbon atoms, R 2 is selected from hydrogen or R, Y is a group of the formula: -K-S-K- and -A-E-A'- or -A'-E-A-, with S= wherein R 1 = C 1 -C 22 -alkyl, C 1 -C 22 -fluoralkyl or aryl, n=200 to 1000, K is a bivalent or trivalent straight chain, cyclic and/or branched C 2 -C 40 hydrocarbon residue, wherein T is selected from a divalent organic group having up to 20 carbon atoms and one or more hetero atoms; and i. one or more quaternary groups; ii. at least one silicone block comprising greater than 200 siloxane units; iii. at least one polyalkylene oxide structural unit; and iv. at least one terminal ester group m is an average value of from above 0 to 100 k is an average value of from above 0 to 50 M represents a terminal group, comprising terminal ester groups selected from -OC -Z -OS 2 -Z -OS(O 2)O-Z -OP (O-Z)OH -OP (O-Z) 2 wherein Z is selected from monovalent organic residues having up to 40 carbon atoms, wherein A and A' each are independently selected from a single bond or a divalent organic group having up to 10 carbon atoms and one or more hetero atoms, and E is a polyalkylene oxide group of the general formula: -[CH 2 CH 2 O] q -[CH 2 CH(CH 3)O] r -[CH 2 CH(C 2 H 5)O] s - with q=0 to 200, r=0 to 200, s=0 to 200, and q+r+s = 1 to 600, q=0 to 200, r=0 to 200, s=0 to 200, and q+r+s = 1 to 600, R is selected from monovalent organic groups having up to 22 carbon atoms, and wherein the free valencies at the nitrogen atoms are bound to carbon atoms, R 2 is selected from hydrogen or R, Y is a group of the formula: -K-S-K- and -A-E-A'- or -A'-E-A-, with S= wherein R 1 = C 1 -C 22 -alkyl, C 1 -C 22 -fluoralkyl or aryl, n=200 to 1000, K is a bivalent or trivalent straight chain, cyclic and/or branched C 2 -C 40 hydrocarbon residue, wherein T is selected from a divalent organic group having up to 20 carbon atoms and one or more hetero atoms; and wherein R 1 = C 1 -C 22 -alkyl, C 1 -C 22 -fluoralkyl or aryl, n=200 to 1000, K is a bivalent or trivalent straight chain, cyclic and/or branched C 2 -C 40 hydrocarbon residue, wherein T is selected from a divalent organic group having up to 20 carbon atoms and one or more hetero atoms; and b) a polymeric thickener.