Refactor so a filter isn't required
upgrade  dependencies