New IDF and fix