changed heartbeat watch implementation