Improved watchlist