moved watches into undefined checks