Filtering implemented but needs tweaking