renamed datastream key and moved watchdog check