wip ef changes