Changed names and Improve filters