Added a filter array, not yet working
Merged