Initial revision of EFA code.