Added in two new filters and added timeout