Updated the EFO version, all tests pass