need review the design for watch list function.