Added filtering input, WIP