I think there is a filter we should add this to as well