EF work for #14 and #16