refactaring
add filter
add const