Added two filters
Added two hooks