#added EF work