E.S.
I highly suggest the pull-up over the diaper at night as well. We used a regular diaper with a pull-up over before we found out about night diapers (my son never appeared uncomfortable and slept through the night). Pampers has started to make a night diaper as well (Huggies has been making one for quite some time) and I prefer those for my son. The combination of the two I hope does the trick for you.