Add more filtering as per itt code