Watch system added, not tested