added filters
changed to watchers
refactor