updated filter and more