Adding a proper watch