I used a crate for my older dog and an expen set up for my younger one. I much preferred the ex pen set up. She had access to water, toys, blankets, her pee pads- but was still contained for her safety. With my older one he would cry by 6 every morning to get out and go to the bathroom- she was able to get up and go and then play if she wanted, so she never whined at all.
__________________
 Armani & Chloe |