Adding diversificationbased and cleaning