Almost done. Filter looks better