Updated to allow watching.