Added a couple of filters