Made watch script portable