Added in watchdog, troubleshooting