Tweak watch functionality