When did you stop swaddling?

Amber

My daughter is 18 weeks old and for the last week she has been fighting her naps. I noticed that when she was falling asleep her hands or feet would move and startle her. So today I decided to swaddle her for the first time and she fell asleep within 2 minutes. She has been asleep for over an hour now. I swaddled her when she was first born for a few weeks and for some reason I just stopped since we didn't have trouble sleeping. Any other parents still swaddling? and if so how old are your little ones?