Now able to add some filters