Renamed watched? and wished? tp watched and wished