ADD filter and some imporvements