add auto watch feature