Watch Now

safety improvements