Removed need for watchdog