Yes, or just wrap her a little looser. I think as the weather warms up the wrapping thing will just stop anyway. My first daughter couldn't sleep without being all swaddled up, but as soon as the really hot weather hit, it was just too uncomfortable for her.

Its so hard isn't it? My kids all rolled onto their tummies too and it made me nervous. I used those wedge things but that only works when they're really little.

I love that photo of Emma.