amended to account for the last changes in DogOnt