Improve design + add 1 filter