filter functional but needs refactoring an performance enhancement
filter functional but needs refactoring an performance enhancement