filter hell
resolved scope and other issues