Salsa....if DS likes to be wrapped but gets out easily, have you tried a specialty wrap like a Swaddle Me?? They have velvro tabs so that bubs finds it hard to get unwrapped. I used one on my DD (now 21 months) with success and now with DS (10 weeks). Except DS doesn't like to have his arms wrapped and is happy to be wrapped under the arms....still gives him comfort though. Just a thought.