make watch feature work