added basic filtering system