Some changes for hound to test