More robust watching