adjusted to latest changes in efaUtil