adding filters and a bunch of stuff