Embodiments of a hair conditioning composition comprise a silicone polymer comprising one or more quaternary groups, at least one silicone block comprising greater than 200 siloxane units, at least one polyalkylene oxide structural unit, and at least one terminal ester group, the silicone polymer having a viscosity of up to 100,000 mPa·s, and wherein the a hair conditioning composition comprises a gel matrix comprising a cationic surfactant, a high melting point fatty compound, and an aqueous carrier.
