Improving watch command