Updated EFA-Init