petes update for watchdod handling