cleaned up
Added custom filter