filtering yay
fixin merge shit