added a bit more to filters, not sure if enough or not though?