changed dependencies
commented out before after filter code
added watchers