added puppy and wall stubs