better naming and filter