We went through this with Tara too, we put her in a seeping bag it stopped all the issues and she sleeping so much better!