We used cotton wraps as they were a bit firmer than muslin and then from about 9 weeks we used a flat cot sheet. Our DS was an expert escape artist too and would wake himself up if not wrapped firmly but the cot sheet works a treat!