FIX: Fix EDF and KIT