added support for watch