added in filtering
added in filtering