improved filter, implemented rooms