Now uses FNCORE and DIAUTIL