Updated the watch function to be not as dumb