better filtration
remove some debug statements, add some other